From 9c91a9593de989192ca2c10f8d534585330d6d47 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 17 Jan 2017 16:25:14 +0800 Subject: [PATCH] MDL-57273 core: Remove magic setters and getters Remove the magic getters and setters from persistent. They are deprecated only in the persistent class for competencies. --- admin/tool/cohortroles/classes/api.php | 10 +- admin/tool/cohortroles/tests/api_test.php | 14 +- .../course_competencies_form_element.php | 6 +- .../course_competency_rule_form_element.php | 2 +- .../external/competency_path_exporter.php | 8 +- .../external/competency_summary_exporter.php | 12 +- .../user_competency_summary_exporter.php | 6 +- ..._competency_summary_in_course_exporter.php | 2 +- .../user_evidence_summary_exporter.php | 2 +- admin/tool/lp/classes/form/competency.php | 27 +- .../lp/classes/form/competency_framework.php | 2 +- .../classes/form/framework_autocomplete.php | 6 +- admin/tool/lp/classes/form/plan.php | 2 +- .../lp/classes/output/competency_summary.php | 4 +- .../output/course_competencies_page.php | 6 +- admin/tool/lp/classes/output/plan_page.php | 2 +- .../classes/output/template_cohorts_table.php | 2 +- .../output/template_competencies_page.php | 6 +- .../classes/output/template_plans_table.php | 2 +- .../output/user_competency_summary.php | 6 +- .../user_competency_summary_in_course.php | 2 +- .../user_competency_summary_in_plan.php | 6 +- admin/tool/lp/classes/page_helper.php | 22 +- admin/tool/lp/tests/externallib_test.php | 22 +- .../tool/lpimportcsv/classes/form/export.php | 2 +- .../classes/framework_exporter.php | 44 +- .../classes/framework_importer.php | 12 +- admin/tool/lpimportcsv/tests/import_test.php | 4 +- .../lpmigrate/classes/framework_mapper.php | 4 +- admin/tool/lpmigrate/tests/processor_test.php | 150 +- competency/classes/api.php | 530 ++-- competency/classes/competency.php | 96 +- competency/classes/competency_framework.php | 28 +- competency/classes/competency_rule.php | 4 +- competency/classes/competency_rule_all.php | 6 +- competency/classes/competency_rule_points.php | 6 +- competency/classes/course_competency.php | 8 +- .../classes/course_competency_settings.php | 4 +- .../classes/course_module_competency.php | 8 +- competency/classes/evidence.php | 10 +- competency/classes/external.php | 14 +- .../competency_framework_exporter.php | 2 +- .../classes/external/evidence_exporter.php | 16 +- .../classes/external/performance_helper.php | 8 +- competency/classes/external/plan_exporter.php | 8 +- .../classes/external/template_exporter.php | 6 +- .../user_competency_course_exporter.php | 8 +- .../external/user_competency_exporter.php | 22 +- .../user_competency_plan_exporter.php | 8 +- .../external/user_evidence_exporter.php | 2 +- competency/classes/persistent.php | 19 + competency/classes/plan.php | 72 +- competency/classes/plan_competency.php | 6 +- competency/classes/related_competency.php | 18 +- competency/classes/template.php | 12 +- competency/classes/template_cohort.php | 4 +- competency/classes/template_competency.php | 6 +- competency/classes/user_competency.php | 22 +- competency/classes/user_competency_course.php | 6 +- competency/classes/user_competency_plan.php | 6 +- competency/classes/user_evidence.php | 16 +- competency/lib.php | 26 +- competency/tests/api_test.php | 2358 ++++++++--------- competency/tests/competency_rule_test.php | 138 +- competency/tests/competency_test.php | 36 +- .../tests/course_competency_settings_test.php | 32 +- competency/tests/course_competency_test.php | 36 +- competency/tests/event_test.php | 318 +-- competency/tests/external_test.php | 408 +-- competency/tests/generator/lib.php | 2 +- competency/tests/generator_test.php | 94 +- competency/tests/hooks_test.php | 98 +- competency/tests/lib_test.php | 44 +- competency/tests/performance_helper_test.php | 16 +- competency/tests/plan_test.php | 144 +- competency/tests/task_test.php | 96 +- competency/tests/template_test.php | 30 +- .../tests/user_evidence_competency_test.php | 44 +- lib/classes/event/competency_created.php | 4 +- lib/classes/event/competency_deleted.php | 4 +- .../event/competency_evidence_created.php | 20 +- .../event/competency_framework_created.php | 6 +- .../event/competency_framework_deleted.php | 6 +- .../event/competency_framework_updated.php | 6 +- .../event/competency_framework_viewed.php | 6 +- .../event/competency_plan_approved.php | 6 +- .../event/competency_plan_completed.php | 6 +- lib/classes/event/competency_plan_created.php | 4 +- lib/classes/event/competency_plan_deleted.php | 4 +- .../event/competency_plan_reopened.php | 6 +- ...mpetency_plan_review_request_cancelled.php | 6 +- .../competency_plan_review_requested.php | 6 +- .../event/competency_plan_review_started.php | 6 +- .../event/competency_plan_review_stopped.php | 6 +- .../event/competency_plan_unapproved.php | 6 +- .../event/competency_plan_unlinked.php | 6 +- lib/classes/event/competency_plan_updated.php | 4 +- lib/classes/event/competency_plan_viewed.php | 4 +- .../event/competency_template_created.php | 6 +- .../event/competency_template_deleted.php | 6 +- .../event/competency_template_updated.php | 6 +- .../event/competency_template_viewed.php | 6 +- lib/classes/event/competency_updated.php | 4 +- ...competency_user_competency_plan_viewed.php | 10 +- .../competency_user_competency_rated.php | 8 +- ...etency_user_competency_rated_in_course.php | 14 +- ...mpetency_user_competency_rated_in_plan.php | 10 +- ...er_competency_review_request_cancelled.php | 6 +- ...tency_user_competency_review_requested.php | 6 +- ...petency_user_competency_review_started.php | 6 +- ...petency_user_competency_review_stopped.php | 6 +- .../competency_user_competency_viewed.php | 8 +- ...tency_user_competency_viewed_in_course.php | 12 +- ...petency_user_competency_viewed_in_plan.php | 8 +- .../competency_user_evidence_created.php | 6 +- .../competency_user_evidence_deleted.php | 6 +- .../competency_user_evidence_updated.php | 6 +- lib/classes/event/competency_viewed.php | 4 +- lib/classes/persistent.php | 89 +- lib/tests/persistent_test.php | 40 +- 120 files changed, 2868 insertions(+), 2823 deletions(-) diff --git a/admin/tool/cohortroles/classes/api.php b/admin/tool/cohortroles/classes/api.php index e610e35f442..8357e70a74d 100644 --- a/admin/tool/cohortroles/classes/api.php +++ b/admin/tool/cohortroles/classes/api.php @@ -149,13 +149,13 @@ class api { // We build an better structure to loop on. $info = array(); foreach ($all as $cra) { - if (!isset($info[$cra->get_userid()])) { - $info[$cra->get_userid()] = array(); + if (!isset($info[$cra->get('userid')])) { + $info[$cra->get('userid')] = array(); } - if (!isset($info[$cra->get_userid()][$cra->get_roleid()])) { - $info[$cra->get_userid()][$cra->get_roleid()] = array(); + if (!isset($info[$cra->get('userid')][$cra->get('roleid')])) { + $info[$cra->get('userid')][$cra->get('roleid')] = array(); } - array_push($info[$cra->get_userid()][$cra->get_roleid()], $cra->get_cohortid()); + array_push($info[$cra->get('userid')][$cra->get('roleid')], $cra->get('cohortid')); } // Then for each user+role combo - find user context in the cohort without a role assigned. diff --git a/admin/tool/cohortroles/tests/api_test.php b/admin/tool/cohortroles/tests/api_test.php index 2fa061b4ca0..d276a2f13ed 100644 --- a/admin/tool/cohortroles/tests/api_test.php +++ b/admin/tool/cohortroles/tests/api_test.php @@ -96,10 +96,10 @@ class tool_cohortroles_api_testcase extends advanced_testcase { 'cohortid' => $this->cohort->id ); $result = api::create_cohort_role_assignment($params); - $this->assertNotEmpty($result->get_id()); - $this->assertEquals($result->get_userid(), $this->userassignto->id); - $this->assertEquals($result->get_roleid(), $this->roleid); - $this->assertEquals($result->get_cohortid(), $this->cohort->id); + $this->assertNotEmpty($result->get('id')); + $this->assertEquals($result->get('userid'), $this->userassignto->id); + $this->assertEquals($result->get('roleid'), $this->roleid); + $this->assertEquals($result->get('cohortid'), $this->cohort->id); } /** @@ -114,7 +114,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase { ); $result = api::create_cohort_role_assignment($params); $this->setUser($this->userassignto); - api::delete_cohort_role_assignment($result->get_id()); + api::delete_cohort_role_assignment($result->get('id')); } /** @@ -128,7 +128,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase { 'cohortid' => $this->cohort->id ); $result = api::create_cohort_role_assignment($params); - api::delete_cohort_role_assignment($result->get_id() + 1); + api::delete_cohort_role_assignment($result->get('id') + 1); } public function test_delete_cohort_role_assignment() { @@ -139,7 +139,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase { 'cohortid' => $this->cohort->id ); $result = api::create_cohort_role_assignment($params); - $worked = api::delete_cohort_role_assignment($result->get_id()); + $worked = api::delete_cohort_role_assignment($result->get('id')); $this->assertTrue($worked); } diff --git a/admin/tool/lp/classes/course_competencies_form_element.php b/admin/tool/lp/classes/course_competencies_form_element.php index 4683e643596..b7698c83bd5 100644 --- a/admin/tool/lp/classes/course_competencies_form_element.php +++ b/admin/tool/lp/classes/course_competencies_form_element.php @@ -65,7 +65,7 @@ class tool_lp_course_competencies_form_element extends MoodleQuickForm_autocompl $current = \core_competency\api::list_course_module_competencies_in_course_module($options['cmid']); $ids = array(); foreach ($current as $coursemodulecompetency) { - array_push($ids, $coursemodulecompetency->get_competencyid()); + array_push($ids, $coursemodulecompetency->get('competencyid')); } $this->setValue($ids); } @@ -76,10 +76,10 @@ class tool_lp_course_competencies_form_element extends MoodleQuickForm_autocompl $context = context_course::instance($courseid); foreach ($competencies as $competency) { // We don't need to show the description as part of the options, so just set this to null. - $competency['competency']->set_description(null); + $competency['competency']->set('description', null); $exporter = new competency_exporter($competency['competency'], array('context' => $context)); $templatecontext = array('competency' => $exporter->export($OUTPUT)); - $id = $competency['competency']->get_id(); + $id = $competency['competency']->get('id'); $validoptions[$id] = $OUTPUT->render_from_template('tool_lp/competency_summary', $templatecontext); } $attributes['tags'] = false; diff --git a/admin/tool/lp/classes/course_competency_rule_form_element.php b/admin/tool/lp/classes/course_competency_rule_form_element.php index 29fc72fe878..049fe98d38c 100644 --- a/admin/tool/lp/classes/course_competency_rule_form_element.php +++ b/admin/tool/lp/classes/course_competency_rule_form_element.php @@ -65,7 +65,7 @@ class tool_lp_course_competency_rule_form_element extends MoodleQuickForm_select // forcing them to be all the same for each activity. if (!empty($current)) { $one = array_pop($current); - $this->setValue($one->get_ruleoutcome()); + $this->setValue($one->get('ruleoutcome')); } } $validoptions = course_module_competency::get_ruleoutcome_list(); diff --git a/admin/tool/lp/classes/external/competency_path_exporter.php b/admin/tool/lp/classes/external/competency_path_exporter.php index e5f11af67c9..1dfe496ed76 100644 --- a/admin/tool/lp/classes/external/competency_path_exporter.php +++ b/admin/tool/lp/classes/external/competency_path_exporter.php @@ -93,8 +93,8 @@ class competency_path_exporter extends \core\external\exporter { $i = 1; foreach ($this->related['ancestors'] as $competency) { $exporter = new path_node_exporter([ - 'id' => $competency->get_id(), - 'name' => $competency->get_idnumber(), + 'id' => $competency->get('id'), + 'name' => $competency->get('idnumber'), 'position' => $i, 'first' => $i == 1, 'last' => $i == $nodescount @@ -107,8 +107,8 @@ class competency_path_exporter extends \core\external\exporter { } $result->ancestors = $ancestors; $exporter = new path_node_exporter([ - 'id' => $this->related['framework']->get_id(), - 'name' => $this->related['framework']->get_shortname(), + 'id' => $this->related['framework']->get('id'), + 'name' => $this->related['framework']->get('shortname'), 'first' => 0, 'last' => 0, 'position' => -1 diff --git a/admin/tool/lp/classes/external/competency_summary_exporter.php b/admin/tool/lp/classes/external/competency_summary_exporter.php index e56d3aa2b6f..163e103e076 100644 --- a/admin/tool/lp/classes/external/competency_summary_exporter.php +++ b/admin/tool/lp/classes/external/competency_summary_exporter.php @@ -116,16 +116,16 @@ class competency_summary_exporter extends \core\external\exporter { $exporter = new competency_framework_exporter($this->related['framework']); $result->framework = $exporter->export($output); - $scaleconfiguration = $this->related['framework']->get_scaleconfiguration(); - $scaleid = $this->related['framework']->get_scaleid(); - if ($competency->get_scaleid()) { - $scaleconfiguration = $competency->get_scaleconfiguration(); - $scaleid = $competency->get_scaleid(); + $scaleconfiguration = $this->related['framework']->get('scaleconfiguration'); + $scaleid = $this->related['framework']->get('scaleid'); + if ($competency->get('scaleid')) { + $scaleconfiguration = $competency->get('scaleconfiguration'); + $scaleid = $competency->get('scaleid'); } $result->scaleconfiguration = $scaleconfiguration; $result->scaleid = $scaleid; - $level = $competency->get_level(); + $level = $competency->get('level'); $taxonomy = $this->related['framework']->get_taxonomy($level); $result->taxonomyterm = (string) (competency_framework::get_taxonomies_list()[$taxonomy]); diff --git a/admin/tool/lp/classes/external/user_competency_summary_exporter.php b/admin/tool/lp/classes/external/user_competency_summary_exporter.php index 87e999a6b0c..229076e3dec 100644 --- a/admin/tool/lp/classes/external/user_competency_summary_exporter.php +++ b/admin/tool/lp/classes/external/user_competency_summary_exporter.php @@ -133,9 +133,9 @@ class user_competency_summary_exporter extends \core\external\exporter { $result->evidence = array(); if (count($this->related['evidence'])) { foreach ($this->related['evidence'] as $evidence) { - $actionuserid = $evidence->get_actionuserid(); + $actionuserid = $evidence->get('actionuserid'); if (!empty($actionuserid)) { - $usercache[$evidence->get_actionuserid()] = true; + $usercache[$evidence->get('actionuserid')] = true; } } $users = array(); @@ -149,7 +149,7 @@ class user_competency_summary_exporter extends \core\external\exporter { } foreach ($this->related['evidence'] as $evidence) { - $actionuserid = $evidence->get_actionuserid(); + $actionuserid = $evidence->get('actionuserid'); $related = array( 'scale' => $scale, 'usercompetency' => ($this->related['usercompetency'] ? $this->related['usercompetency'] : null), diff --git a/admin/tool/lp/classes/external/user_competency_summary_in_course_exporter.php b/admin/tool/lp/classes/external/user_competency_summary_in_course_exporter.php index ee9fc933c5d..d1b7b7f3300 100644 --- a/admin/tool/lp/classes/external/user_competency_summary_in_course_exporter.php +++ b/admin/tool/lp/classes/external/user_competency_summary_in_course_exporter.php @@ -83,7 +83,7 @@ class user_competency_summary_in_course_exporter extends \core\external\exporter $exporter = new course_summary_exporter($this->related['course'], array('context' => $context)); $result->course = $exporter->export($output); - $coursemodules = api::list_course_modules_using_competency($this->related['competency']->get_id(), + $coursemodules = api::list_course_modules_using_competency($this->related['competency']->get('id'), $this->related['course']->id); $fastmodinfo = get_fast_modinfo($this->related['course']->id); diff --git a/admin/tool/lp/classes/external/user_evidence_summary_exporter.php b/admin/tool/lp/classes/external/user_evidence_summary_exporter.php index d5c091a0fe7..7b8ddc97a27 100644 --- a/admin/tool/lp/classes/external/user_evidence_summary_exporter.php +++ b/admin/tool/lp/classes/external/user_evidence_summary_exporter.php @@ -75,7 +75,7 @@ class user_evidence_summary_exporter extends \core\external\persistent_exporter protected function get_other_values(renderer_base $output) { $urlshort = ''; - $url = $this->persistent->get_url(); + $url = $this->persistent->get('url'); if (!empty($url)) { $murl = new moodle_url($url); $shorturl = preg_replace('@^https?://(www\.)?@', '', $murl->out(false)); diff --git a/admin/tool/lp/classes/form/competency.php b/admin/tool/lp/classes/form/competency.php index 7d5f77af7e1..f0a5f1889cd 100644 --- a/admin/tool/lp/classes/form/competency.php +++ b/admin/tool/lp/classes/form/competency.php @@ -54,26 +54,29 @@ class competency extends persistent { $mform->addElement('hidden', 'competencyframeworkid'); $mform->setType('competencyframeworkid', PARAM_INT); - $mform->setConstant('competencyframeworkid', $framework->get_id()); + $mform->setConstant('competencyframeworkid', $framework->get('id')); $mform->addElement('header', 'generalhdr', get_string('general')); $mform->addElement('static', 'frameworkdesc', get_string('competencyframework', 'tool_lp'), - s($framework->get_shortname())); + s($framework->get('shortname'))); $mform->addElement('hidden', 'parentid', '', array('id' => 'tool_lp_parentcompetency')); $mform->setType('parentid', PARAM_INT); - $mform->setConstant('parentid', ($parent) ? $parent->get_id() : 0); - $parentlevel = ($parent) ? $parent->get_level() : 0; - $parentname = ($parent) ? $parent->get_shortname() : get_string('competencyframeworkroot', 'tool_lp'); - $parentlabel = ($competency->get_id()) ? - get_string('taxonomy_parent_' . $framework->get_taxonomy($parentlevel), 'tool_lp') : - get_string('parentcompetency', 'tool_lp'); + $mform->setConstant('parentid', ($parent) ? $parent->get('id') : 0); + $parentlevel = ($parent) ? $parent->get('level') : 0; + $parentname = ($parent) ? $parent->get('shortname') : get_string('competencyframeworkroot', 'tool_lp'); + $parentlabel = ''; + if (!empty($competency->get('id'))) { + $parentlabel = get_string('taxonomy_parent_' . $framework->get_taxonomy($parentlevel), 'tool_lp'); + } else { + $parentlabel = get_string('parentcompetency', 'tool_lp'); + } $editaction = ''; - if (!$competency->get_id()) { + if (!$competency->get('id')) { $icon = $OUTPUT->pix_icon('t/editinline', get_string('parentcompetency_edit', 'tool_lp')); $editaction = $OUTPUT->action_link('#', $icon, null, array('id' => 'id_parentcompetencybutton')); } @@ -83,12 +86,12 @@ class competency extends persistent { $parentlabel, "$parentname ".$editaction); // Set the picker competency when adding new competency. - if (!$competency->get_id()) { + if (!$competency->get('id')) { // Call the parentcompetency_form init to initialize the competency picker for parent competency. $PAGE->requires->js_call_amd('tool_lp/parentcompetency_form', 'init', array('#id_parentcompetencybutton', '#tool_lp_parentcompetency', '#id_parentdesc', - $framework->get_id(), + $framework->get('id'), $pagecontextid)); } @@ -124,7 +127,7 @@ class competency extends persistent { // configuration requires this field so we only disable it. It is fine as setting the value // as a constant will ensure that nobody can change it. And it's validated in the persistent anyway. $scaleid->updateAttributes(array('disabled' => 'disabled')); - $mform->setConstant('scaleid', $competency->get_scaleid()); + $mform->setConstant('scaleid', $competency->get('scaleid')); } // Disable short forms. diff --git a/admin/tool/lp/classes/form/competency_framework.php b/admin/tool/lp/classes/form/competency_framework.php index a806d7564e1..5ba431faf0d 100644 --- a/admin/tool/lp/classes/form/competency_framework.php +++ b/admin/tool/lp/classes/form/competency_framework.php @@ -80,7 +80,7 @@ class competency_framework extends persistent { // configuration requires this field so we only disable it. It is fine as setting the value // as a constant will ensure that nobody can change it. And it's validated in the persistent anyway. $scaleid->updateAttributes(array('readonly' => 'readonly')); - $mform->setConstant('scaleid', $framework->get_scaleid()); + $mform->setConstant('scaleid', $framework->get('scaleid')); } $mform->addElement('button', 'scaleconfigbutton', get_string('configurescale', 'tool_lp')); diff --git a/admin/tool/lp/classes/form/framework_autocomplete.php b/admin/tool/lp/classes/form/framework_autocomplete.php index 95053321706..7237be049d8 100644 --- a/admin/tool/lp/classes/form/framework_autocomplete.php +++ b/admin/tool/lp/classes/form/framework_autocomplete.php @@ -109,11 +109,11 @@ class framework_autocomplete extends MoodleQuickForm_autocomplete { if (!has_any_capability(array('moodle/competency:competencyview', 'moodle/competency:competencymanage'), $framework->get_context())) { continue; - } else if ($this->onlyvisible && !$framework->get_visible()) { + } else if ($this->onlyvisible && !$framework->get('visible')) { continue; } - $this->addOption($framework->get_shortname() . ' ' . $framework->get_idnumber(), $framework->get_id()); - array_push($toselect, $framework->get_id()); + $this->addOption($framework->get('shortname') . ' ' . $framework->get('idnumber'), $framework->get('id')); + array_push($toselect, $framework->get('id')); } return $this->setSelected($toselect); diff --git a/admin/tool/lp/classes/form/plan.php b/admin/tool/lp/classes/form/plan.php index 988dfeaa98b..3ce193d4839 100644 --- a/admin/tool/lp/classes/form/plan.php +++ b/admin/tool/lp/classes/form/plan.php @@ -69,7 +69,7 @@ class plan extends persistent { // When the plan was already saved then the status can not be changed via this form. $status = planpersistent::get_status_list($this->_customdata['userid']); $plan = $this->get_persistent(); - if ($plan->get_id()) { + if ($plan->get('id')) { // The current status is not selectable (workflow status probably), we just display it. $mform->addElement('static', 'staticstatus', get_string('status', 'tool_lp'), $plan->get_statusname()); } else if (!empty($status) && count($status) > 1) { diff --git a/admin/tool/lp/classes/output/competency_summary.php b/admin/tool/lp/classes/output/competency_summary.php index 05480029cde..4977d87712f 100644 --- a/admin/tool/lp/classes/output/competency_summary.php +++ b/admin/tool/lp/classes/output/competency_summary.php @@ -63,11 +63,11 @@ class competency_summary implements renderable, templatable { $this->competency = $competency; $this->framework = $framework; if ($includerelated) { - $this->relatedcompetencies = api::list_related_competencies($competency->get_id()); + $this->relatedcompetencies = api::list_related_competencies($competency->get('id')); } if ($includecourses) { - $this->courses = api::list_courses_using_competency($competency->get_id()); + $this->courses = api::list_courses_using_competency($competency->get('id')); } } diff --git a/admin/tool/lp/classes/output/course_competencies_page.php b/admin/tool/lp/classes/output/course_competencies_page.php index b6a7bd26fa4..eaf7d340c9a 100644 --- a/admin/tool/lp/classes/output/course_competencies_page.php +++ b/admin/tool/lp/classes/output/course_competencies_page.php @@ -136,9 +136,9 @@ class course_competencies_page implements renderable, templatable { $ccexporter = new course_competency_exporter($coursecompetency, array('context' => $context)); $ccoutcomeoptions = (array) (object) $ruleoutcomeoptions; - $ccoutcomeoptions[$coursecompetency->get_ruleoutcome()]['selected'] = true; + $ccoutcomeoptions[$coursecompetency->get('ruleoutcome')]['selected'] = true; - $coursemodules = api::list_course_modules_using_competency($competency->get_id(), $this->courseid); + $coursemodules = api::list_course_modules_using_competency($competency->get('id'), $this->courseid); $fastmodinfo = get_fast_modinfo($this->courseid); $exportedmodules = array(); @@ -164,7 +164,7 @@ class course_competencies_page implements renderable, templatable { if ($gradable) { $foundusercompetencycourse = false; foreach ($usercompetencycourses as $usercompetencycourse) { - if ($usercompetencycourse->get_competencyid() == $competency->get_id()) { + if ($usercompetencycourse->get('competencyid') == $competency->get('id')) { $foundusercompetencycourse = $usercompetencycourse; } } diff --git a/admin/tool/lp/classes/output/plan_page.php b/admin/tool/lp/classes/output/plan_page.php index aa79b83f802..aa4188cb1a0 100644 --- a/admin/tool/lp/classes/output/plan_page.php +++ b/admin/tool/lp/classes/output/plan_page.php @@ -107,7 +107,7 @@ class plan_page implements renderable, templatable { $record->$ucproperty = $exporter->export($output); $data->competencies[] = $record; - if ($usercomp->get_proficiency()) { + if ($usercomp->get('proficiency')) { $proficientcount++; } } diff --git a/admin/tool/lp/classes/output/template_cohorts_table.php b/admin/tool/lp/classes/output/template_cohorts_table.php index bdd68e3208d..090fd971d7f 100644 --- a/admin/tool/lp/classes/output/template_cohorts_table.php +++ b/admin/tool/lp/classes/output/template_cohorts_table.php @@ -142,7 +142,7 @@ class template_cohorts_table extends table_sql { FROM {" . \core_competency\template_cohort::TABLE . "} tc JOIN {cohort} c ON c.id = tc.cohortid WHERE tc.templateid = :templateid"; - $params = array('templateid' => $this->template->get_id()); + $params = array('templateid' => $this->template->get('id')); // Add order by if needed. if (!$count && $sqlsort = $this->get_sql_sort()) { diff --git a/admin/tool/lp/classes/output/template_competencies_page.php b/admin/tool/lp/classes/output/template_competencies_page.php index eff7ab7b03f..2fb3558479e 100644 --- a/admin/tool/lp/classes/output/template_competencies_page.php +++ b/admin/tool/lp/classes/output/template_competencies_page.php @@ -77,7 +77,7 @@ class template_competencies_page implements renderable, templatable { public function __construct(template $template, context $pagecontext) { $this->pagecontext = $pagecontext; $this->template = $template; - $this->templatestatistics = new template_statistics($template->get_id()); + $this->templatestatistics = new template_statistics($template->get('id')); $this->competencies = api::list_competencies_in_template($template); $this->canmanagecompetencyframeworks = has_capability('moodle/competency:competencymanage', $this->pagecontext); $this->canmanagetemplatecompetencies = has_capability('moodle/competency:templatemanage', $this->pagecontext); @@ -101,8 +101,8 @@ class template_competencies_page implements renderable, templatable { $context = $helper->get_context_from_competency($competency); $framework = $helper->get_framework_from_competency($competency); - $courses = api::list_courses_using_competency($competency->get_id()); - $relatedcompetencies = api::list_related_competencies($competency->get_id()); + $courses = api::list_courses_using_competency($competency->get('id')); + $relatedcompetencies = api::list_related_competencies($competency->get('id')); $related = array( 'competency' => $competency, diff --git a/admin/tool/lp/classes/output/template_plans_table.php b/admin/tool/lp/classes/output/template_plans_table.php index b495ded8884..422e62af9ea 100644 --- a/admin/tool/lp/classes/output/template_plans_table.php +++ b/admin/tool/lp/classes/output/template_plans_table.php @@ -151,7 +151,7 @@ class template_plans_table extends table_sql { FROM {" . \core_competency\plan::TABLE . "} p JOIN {user} u ON u.id = p.userid WHERE p.templateid = :templateid"; - $params = array('templateid' => $this->template->get_id()); + $params = array('templateid' => $this->template->get('id')); // Add order by if needed. if (!$count && $sqlsort = $this->get_sql_sort()) { diff --git a/admin/tool/lp/classes/output/user_competency_summary.php b/admin/tool/lp/classes/output/user_competency_summary.php index f40880b754e..53680069c2f 100644 --- a/admin/tool/lp/classes/output/user_competency_summary.php +++ b/admin/tool/lp/classes/output/user_competency_summary.php @@ -65,7 +65,7 @@ class user_competency_summary implements renderable, templatable { */ public function export_for_template(renderer_base $output) { if (!isset($related['user'])) { - $related['user'] = core_user::get_user($this->usercompetency->get_userid()); + $related['user'] = core_user::get_user($this->usercompetency->get('userid')); } if (!isset($related['competency'])) { $related['competency'] = $this->usercompetency->get_competency(); @@ -75,8 +75,8 @@ class user_competency_summary implements renderable, templatable { 'usercompetency' => $this->usercompetency, 'usercompetencyplan' => null, 'usercompetencycourse' => null, - 'evidence' => api::list_evidence($this->usercompetency->get_userid(), $this->usercompetency->get_competencyid()), - 'relatedcompetencies' => api::list_related_competencies($this->usercompetency->get_competencyid()) + 'evidence' => api::list_evidence($this->usercompetency->get('userid'), $this->usercompetency->get('competencyid')), + 'relatedcompetencies' => api::list_related_competencies($this->usercompetency->get('competencyid')) ); $exporter = new user_competency_summary_exporter(null, $related); $data = $exporter->export($output); diff --git a/admin/tool/lp/classes/output/user_competency_summary_in_course.php b/admin/tool/lp/classes/output/user_competency_summary_in_course.php index 2abc6f9212c..cb7f5182964 100644 --- a/admin/tool/lp/classes/output/user_competency_summary_in_course.php +++ b/admin/tool/lp/classes/output/user_competency_summary_in_course.php @@ -76,7 +76,7 @@ class user_competency_summary_in_course implements renderable, templatable { throw new \invalid_parameter_exception('Invalid params. The competency does not belong to the course.'); } - $relatedcompetencies = api::list_related_competencies($competency->get_id()); + $relatedcompetencies = api::list_related_competencies($competency->get('id')); $user = $DB->get_record('user', array('id' => $this->userid)); $evidence = api::list_evidence_in_course($this->userid, $this->courseid, $this->competencyid); $course = $DB->get_record('course', array('id' => $this->courseid)); diff --git a/admin/tool/lp/classes/output/user_competency_summary_in_plan.php b/admin/tool/lp/classes/output/user_competency_summary_in_plan.php index e650aa15ecd..f2cd81b12d7 100644 --- a/admin/tool/lp/classes/output/user_competency_summary_in_plan.php +++ b/admin/tool/lp/classes/output/user_competency_summary_in_plan.php @@ -74,10 +74,10 @@ class user_competency_summary_in_plan implements renderable, templatable { throw new \invalid_parameter_exception('Invalid params. The competency does not belong to the plan.'); } - $relatedcompetencies = api::list_related_competencies($competency->get_id()); - $userid = $plan->get_userid(); + $relatedcompetencies = api::list_related_competencies($competency->get('id')); + $userid = $plan->get('userid'); $user = $DB->get_record('user', array('id' => $userid)); - $evidence = api::list_evidence($userid, $this->competencyid, $plan->get_id()); + $evidence = api::list_evidence($userid, $this->competencyid, $plan->get('id')); $params = array( 'competency' => $competency, diff --git a/admin/tool/lp/classes/page_helper.php b/admin/tool/lp/classes/page_helper.php index 476339a7519..03245b53e47 100644 --- a/admin/tool/lp/classes/page_helper.php +++ b/admin/tool/lp/classes/page_helper.php @@ -121,7 +121,7 @@ class page_helper { $templateurl = null; if ($template) { $templateurl = new moodle_url('/admin/tool/lp/templatecompetencies.php', [ - 'templateid' => $template->get_id(), + 'templateid' => $template->get('id'), 'pagecontextid' => $pagecontextid ]); } @@ -135,7 +135,7 @@ class page_helper { $PAGE->set_context($pagecontext); if (!empty($template)) { - $title = format_string($template->get_shortname(), true, array('context' => $context)); + $title = format_string($template->get('shortname'), true, array('context' => $context)); } else { $title = get_string('templates', 'tool_lp'); } @@ -199,7 +199,7 @@ class page_helper { $plansurl = new moodle_url('/admin/tool/lp/plans.php', array('userid' => $userid)); $planurl = null; if ($plan) { - $planurl = new moodle_url('/admin/tool/lp/plan.php', array('id' => $plan->get_id())); + $planurl = new moodle_url('/admin/tool/lp/plan.php', array('id' => $plan->get('id'))); } $returnurl = $plansurl; @@ -218,7 +218,7 @@ class page_helper { } if (!empty($plan)) { - $title = format_string($plan->get_name(), true, array('context' => $context)); + $title = format_string($plan->get('name'), true, array('context' => $context)); } else { $title = get_string('learningplans', 'tool_lp'); } @@ -273,7 +273,7 @@ class page_helper { $evidencelisturl = new moodle_url('/admin/tool/lp/user_evidence_list.php', array('userid' => $userid)); $evidenceurl = null; if ($evidence) { - $evidenceurl = new moodle_url('/admin/tool/lp/user_evidence.php', array('id' => $evidence->get_id())); + $evidenceurl = new moodle_url('/admin/tool/lp/user_evidence.php', array('id' => $evidence->get('id'))); } $returnurl = $evidencelisturl; @@ -292,7 +292,7 @@ class page_helper { } if (!empty($evidence)) { - $title = format_string($evidence->get_name(), true, array('context' => $context)); + $title = format_string($evidence->get('name'), true, array('context' => $context)); } else { $title = get_string('userevidence', 'tool_lp'); } @@ -352,7 +352,7 @@ class page_helper { $url->remove_params(array('id')); $PAGE->navbar->add($pagesubtitle, $url); } else { - $pagetitle = $framework->get_shortname(); + $pagetitle = $framework->get('shortname'); $pagesubtitle = get_string('editcompetencyframework', 'tool_lp'); if ($returntype == 'competencies') { $frameworksurl = new moodle_url('/admin/tool/lp/competencies.php', array( @@ -417,18 +417,18 @@ class page_helper { // Set return url. $returnurloptions = [ - 'competencyframeworkid' => $framework->get_id(), + 'competencyframeworkid' => $framework->get('id'), 'pagecontextid' => $pagecontextid ]; $returnurl = new moodle_url('/admin/tool/lp/competencies.php', $returnurloptions); - $PAGE->navbar->add($framework->get_shortname(), $returnurl); + $PAGE->navbar->add($framework->get('shortname'), $returnurl); // Set page layout. $PAGE->set_pagelayout('admin'); if (empty($competency)) { // Add mode. - $title = format_string($framework->get_shortname(), true, ['context' => $pagecontext]); + $title = format_string($framework->get('shortname'), true, ['context' => $pagecontext]); // Set the sub-title for add mode. $level = $parent ? $parent->get_level() + 1 : 1; @@ -436,7 +436,7 @@ class page_helper { } else { // Edit mode. - $title = format_string($competency->get_shortname(), true, ['context' => $competency->get_context()]); + $title = format_string($competency->get('shortname'), true, ['context' => $competency->get_context()]); // Add competency name to breadcrumbs, if available. $PAGE->navbar->add($title); diff --git a/admin/tool/lp/tests/externallib_test.php b/admin/tool/lp/tests/externallib_test.php index 855d02ff6f0..d523735876d 100644 --- a/admin/tool/lp/tests/externallib_test.php +++ b/admin/tool/lp/tests/externallib_test.php @@ -423,19 +423,19 @@ class tool_lp_external_testcase extends externallib_advanced_testcase { $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $tpl = $lpg->create_template(); - $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1->get_id())); + $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1->get('id'))); - $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get_id(), 'name' => 'Evil')); + $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get('id'), 'name' => 'Evil')); - $uc = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1->get_id())); + $uc = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1->get('id'))); - $evidence = \core_competency\external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 1, true); - $evidence = \core_competency\external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 2, true); + $evidence = \core_competency\external::grade_competency_in_plan($plan->get('id'), $c1->get('id'), 1, true); + $evidence = \core_competency\external::grade_competency_in_plan($plan->get('id'), $c1->get('id'), 2, true); - $summary = external::data_for_user_competency_summary_in_plan($c1->get_id(), $plan->get_id()); + $summary = external::data_for_user_competency_summary_in_plan($c1->get('id'), $plan->get('id')); $this->assertTrue($summary->usercompetencysummary->cangrade); $this->assertEquals('Evil', $summary->plan->name); $this->assertEquals('B', $summary->usercompetencysummary->usercompetency->gradename); @@ -449,12 +449,12 @@ class tool_lp_external_testcase extends externallib_advanced_testcase { $dg = $this->getDataGenerator(); $lpg = $dg->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); - $evidence = \core_competency\external::grade_competency($this->user->id, $c1->get_id(), 1, true); - $evidence = \core_competency\external::grade_competency($this->user->id, $c1->get_id(), 2, true); + $evidence = \core_competency\external::grade_competency($this->user->id, $c1->get('id'), 1, true); + $evidence = \core_competency\external::grade_competency($this->user->id, $c1->get('id'), 2, true); - $summary = external::data_for_user_competency_summary($this->user->id, $c1->get_id()); + $summary = external::data_for_user_competency_summary($this->user->id, $c1->get('id')); $this->assertTrue($summary->cangrade); $this->assertEquals('B', $summary->usercompetency->gradename); $this->assertEquals('B', $summary->evidence[0]->gradename); diff --git a/admin/tool/lpimportcsv/classes/form/export.php b/admin/tool/lpimportcsv/classes/form/export.php index 1eac37f9a13..fbcdf2eb245 100644 --- a/admin/tool/lpimportcsv/classes/form/export.php +++ b/admin/tool/lpimportcsv/classes/form/export.php @@ -52,7 +52,7 @@ class export extends moodleform { $options = array(); foreach ($frameworks as $framework) { - $options[$framework->get_id()] = $framework->get_shortname(); + $options[$framework->get('id')] = $framework->get('shortname'); } if (empty($options)) { $mform->addElement('static', 'frameworkid', '', get_string('noframeworks', 'tool_lpimportcsv')); diff --git a/admin/tool/lpimportcsv/classes/framework_exporter.php b/admin/tool/lpimportcsv/classes/framework_exporter.php index e507dd90f6b..1295739cdad 100644 --- a/admin/tool/lpimportcsv/classes/framework_exporter.php +++ b/admin/tool/lpimportcsv/classes/framework_exporter.php @@ -61,7 +61,7 @@ class framework_exporter { require_once($CFG->libdir . '/csvlib.class.php'); $writer = new csv_export_writer(); - $filename = clean_param($this->framework->get_shortname() . '-' . $this->framework->get_idnumber(), PARAM_FILE); + $filename = clean_param($this->framework->get('shortname') . '-' . $this->framework->get('idnumber'), PARAM_FILE); $writer->set_filename($filename); $headers = framework_importer::list_required_headers(); @@ -71,12 +71,12 @@ class framework_exporter { // Order and number of columns must match framework_importer::list_required_headers(). $row = array( '', - $this->framework->get_idnumber(), - $this->framework->get_shortname(), - $this->framework->get_description(), - $this->framework->get_descriptionformat(), + $this->framework->get('idnumber'), + $this->framework->get('shortname'), + $this->framework->get('description'), + $this->framework->get('descriptionformat'), $this->framework->get_scale()->compact_items(), - $this->framework->get_scaleconfiguration(), + $this->framework->get('scaleconfiguration'), '', '', '', @@ -87,28 +87,28 @@ class framework_exporter { ); $writer->add_data($row); - $filters = array('competencyframeworkid' => $this->framework->get_id()); + $filters = array('competencyframeworkid' => $this->framework->get('id')); $competencies = api::list_competencies($filters); // Index by id so we can lookup parents. $indexed = array(); foreach ($competencies as $competency) { - $indexed[$competency->get_id()] = $competency; + $indexed[$competency->get('id')] = $competency; } foreach ($competencies as $competency) { $parentidnumber = ''; - if ($competency->get_parentid() > 0) { - $parent = $indexed[$competency->get_parentid()]; - $parentidnumber = $parent->get_idnumber(); + if ($competency->get('parentid') > 0) { + $parent = $indexed[$competency->get('parentid')]; + $parentidnumber = $parent->get('idnumber'); } $scalevalues = ''; $scaleconfig = ''; - if ($competency->get_scaleid() !== null) { + if ($competency->get('scaleid') !== null) { $scalevalues = $competency->get_scale()->compact_items(); - $scaleconfig = $competency->get_scaleconfiguration(); + $scaleconfig = $competency->get('scaleconfiguration'); } - $ruleconfig = $competency->get_ruleconfig(); + $ruleconfig = $competency->get('ruleconfig'); if ($ruleconfig === null) { $ruleconfig = "null"; } @@ -117,24 +117,24 @@ class framework_exporter { $relatedidnumbers = array(); foreach ($allrelated as $onerelated) { - $relatedidnumbers[] = str_replace(',', '%2C', $onerelated->get_idnumber()); + $relatedidnumbers[] = str_replace(',', '%2C', $onerelated->get('idnumber')); } $relatedidnumbers = implode(',', $relatedidnumbers); // Order and number of columns must match framework_importer::list_required_headers(). $row = array( $parentidnumber, - $competency->get_idnumber(), - $competency->get_shortname(), - $competency->get_description(), - $competency->get_descriptionformat(), + $competency->get('idnumber'), + $competency->get('shortname'), + $competency->get('description'), + $competency->get('descriptionformat'), $scalevalues, $scaleconfig, - $competency->get_ruletype(), - $competency->get_ruleoutcome(), + $competency->get('ruletype'), + $competency->get('ruleoutcome'), $ruleconfig, $relatedidnumbers, - $competency->get_id(), + $competency->get('id'), false, '' ); diff --git a/admin/tool/lpimportcsv/classes/framework_importer.php b/admin/tool/lpimportcsv/classes/framework_importer.php index 82b3516045d..c8f9816c0a1 100644 --- a/admin/tool/lpimportcsv/classes/framework_importer.php +++ b/admin/tool/lpimportcsv/classes/framework_importer.php @@ -320,7 +320,7 @@ class framework_importer { */ public function create_competency($record, $parent, $framework) { $competency = new stdClass(); - $competency->competencyframeworkid = $framework->get_id(); + $competency->competencyframeworkid = $framework->get('id'); $competency->shortname = $record->shortname; if (!empty($record->description)) { $competency->description = $record->description; @@ -331,7 +331,7 @@ class framework_importer { $competency->scaleconfiguration = $this->get_scale_configuration($competency->scaleid, $record->scaleconfiguration); } if ($parent) { - $competency->parentid = $parent->get_id(); + $competency->parentid = $parent->get('id'); } else { $competency->parentid = 0; } @@ -414,7 +414,7 @@ class framework_importer { if (isset($this->flat[$idnumber])) { $relatedcomp = $this->flat[$idnumber]->createdcomp; - api::add_related_competency($comp->get_id(), $relatedcomp->get_id()); + api::add_related_competency($comp->get('id'), $relatedcomp->get('id')); } } } @@ -437,9 +437,9 @@ class framework_importer { $oldruleconfig = null; } $newruleconfig = $class::migrate_config($oldruleconfig, $this->mappings); - $comp->set_ruleconfig($newruleconfig); - $comp->set_ruletype($class); - $comp->set_ruleoutcome($record->ruleoutcome); + $comp->set('ruleconfig', $newruleconfig); + $comp->set('ruletype', $class); + $comp->set('ruleoutcome', $record->ruleoutcome); $comp->update(); } } diff --git a/admin/tool/lpimportcsv/tests/import_test.php b/admin/tool/lpimportcsv/tests/import_test.php index 3063b54fa11..b0d8d0948c2 100644 --- a/admin/tool/lpimportcsv/tests/import_test.php +++ b/admin/tool/lpimportcsv/tests/import_test.php @@ -47,10 +47,10 @@ class tool_lpimportcsv_import_testcase extends advanced_testcase { $framework = $importer->import(); $this->assertEmpty('', $importer->get_error()); - $this->assertGreaterThan(0, $framework->get_id()); + $this->assertGreaterThan(0, $framework->get('id')); $filters = [ - 'competencyframeworkid' => $framework->get_id() + 'competencyframeworkid' => $framework->get('id') ]; $count = api::count_competencies($filters); $this->assertEquals(64, $count); diff --git a/admin/tool/lpmigrate/classes/framework_mapper.php b/admin/tool/lpmigrate/classes/framework_mapper.php index 83090fe67d1..e997f704a65 100644 --- a/admin/tool/lpmigrate/classes/framework_mapper.php +++ b/admin/tool/lpmigrate/classes/framework_mapper.php @@ -80,8 +80,8 @@ class framework_mapper { // Find mappings. foreach ($collectionfrom as $keyfrom => $compfrom) { foreach ($collectionto as $keyto => $compto) { - if ($compfrom->get_idnumber() == $compto->get_idnumber()) { - $map[$compfrom->get_id()] = $compto->get_id(); + if ($compfrom->get('idnumber') == $compto->get('idnumber')) { + $map[$compfrom->get('id')] = $compto->get('id'); unset($collectionfrom[$keyfrom]); unset($collectionto[$keyto]); break; diff --git a/admin/tool/lpmigrate/tests/processor_test.php b/admin/tool/lpmigrate/tests/processor_test.php index 78eb45b9d23..c8db5c18ac7 100644 --- a/admin/tool/lpmigrate/tests/processor_test.php +++ b/admin/tool/lpmigrate/tests/processor_test.php @@ -55,16 +55,16 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $f2 = $lpg->create_framework(array('idnumber' => 'BIO2016')); $f1comps = array(); - $f1comps['A1'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'idnumber' => 'A1')); - $f1comps['A2'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'idnumber' => 'A2')); - $f1comps['A3'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'idnumber' => 'A3')); - $f1comps['X1'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'idnumber' => 'X1')); + $f1comps['A1'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'idnumber' => 'A1')); + $f1comps['A2'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'idnumber' => 'A2')); + $f1comps['A3'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'idnumber' => 'A3')); + $f1comps['X1'] = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'idnumber' => 'X1')); $f2comps = array(); - $f2comps['A1'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id(), 'idnumber' => 'A1')); - $f2comps['A2'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id(), 'idnumber' => 'A2')); - $f2comps['A3'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id(), 'idnumber' => 'A3')); - $f2comps['Y1'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id(), 'idnumber' => 'Y1')); + $f2comps['A1'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'), 'idnumber' => 'A1')); + $f2comps['A2'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'), 'idnumber' => 'A2')); + $f2comps['A3'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'), 'idnumber' => 'A3')); + $f2comps['Y1'] = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'), 'idnumber' => 'Y1')); $c1 = $dg->create_course(array('startdate' => time() - 72000)); $c2 = $dg->create_course(array('startdate' => time() + 72000)); @@ -83,47 +83,47 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { // Course CompetencieS. $ccs = array( $c1->id => array( - $f1comps['A1']->get_id() => $lpg->create_course_competency(array('courseid' => $c1->id, - 'competencyid' => $f1comps['A1']->get_id())), - $f1comps['A3']->get_id() => $lpg->create_course_competency(array('courseid' => $c1->id, - 'competencyid' => $f1comps['A3']->get_id())), - $f1comps['X1']->get_id() => $lpg->create_course_competency(array('courseid' => $c1->id, - 'competencyid' => $f1comps['X1']->get_id())), + $f1comps['A1']->get('id') => $lpg->create_course_competency(array('courseid' => $c1->id, + 'competencyid' => $f1comps['A1']->get('id'))), + $f1comps['A3']->get('id') => $lpg->create_course_competency(array('courseid' => $c1->id, + 'competencyid' => $f1comps['A3']->get('id'))), + $f1comps['X1']->get('id') => $lpg->create_course_competency(array('courseid' => $c1->id, + 'competencyid' => $f1comps['X1']->get('id'))), ), $c2->id => array( - $f1comps['A2']->get_id() => $lpg->create_course_competency(array('courseid' => $c2->id, - 'competencyid' => $f1comps['A2']->get_id())), - $f1comps['A3']->get_id() => $lpg->create_course_competency(array('courseid' => $c2->id, - 'competencyid' => $f1comps['A3']->get_id())), + $f1comps['A2']->get('id') => $lpg->create_course_competency(array('courseid' => $c2->id, + 'competencyid' => $f1comps['A2']->get('id'))), + $f1comps['A3']->get('id') => $lpg->create_course_competency(array('courseid' => $c2->id, + 'competencyid' => $f1comps['A3']->get('id'))), ) ); // Course Module CompetencieS. $cmcs = array( $cms[$c1->id]['F1']->cmid => array( - $f1comps['A1']->get_id() => $lpg->create_course_module_competency(array( + $f1comps['A1']->get('id') => $lpg->create_course_module_competency(array( 'cmid' => $cms[$c1->id]['F1']->cmid, - 'competencyid' => $f1comps['A1']->get_id() + 'competencyid' => $f1comps['A1']->get('id') )), - $f1comps['X1']->get_id() => $lpg->create_course_module_competency(array( + $f1comps['X1']->get('id') => $lpg->create_course_module_competency(array( 'cmid' => $cms[$c1->id]['F1']->cmid, - 'competencyid' => $f1comps['X1']->get_id() + 'competencyid' => $f1comps['X1']->get('id') )), ), $cms[$c1->id]['P1']->cmid => array( - $f1comps['A3']->get_id() => $lpg->create_course_module_competency(array( + $f1comps['A3']->get('id') => $lpg->create_course_module_competency(array( 'cmid' => $cms[$c1->id]['P1']->cmid, - 'competencyid' => $f1comps['A3']->get_id() + 'competencyid' => $f1comps['A3']->get('id') )), ), $cms[$c2->id]['F1']->cmid => array( - $f1comps['A2']->get_id() => $lpg->create_course_module_competency(array( + $f1comps['A2']->get('id') => $lpg->create_course_module_competency(array( 'cmid' => $cms[$c2->id]['F1']->cmid, - 'competencyid' => $f1comps['A2']->get_id() + 'competencyid' => $f1comps['A2']->get('id') )), - $f1comps['A3']->get_id() => $lpg->create_course_module_competency(array( + $f1comps['A3']->get('id') => $lpg->create_course_module_competency(array( 'cmid' => $cms[$c2->id]['F1']->cmid, - 'competencyid' => $f1comps['A3']->get_id() + 'competencyid' => $f1comps['A3']->get('id') )), ), ); @@ -153,7 +153,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { public function test_simple_migration() { $this->setAdminUser(); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->proceed(); @@ -170,7 +170,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->assertEquals(array(), $processor->get_warnings()); $this->assertEquals(array(), $processor->get_errors()); - $this->assertEquals(array($this->f1comps['X1']->get_id() => true), $processor->get_missing_mappings()); + $this->assertEquals(array($this->f1comps['X1']->get('id') => true), $processor->get_missing_mappings()); $this->assertCourseCompetencyMigrated($this->c1, $this->f1comps['A1'], $this->f2comps['A1']); $this->assertCourseCompetencyMigrated($this->c1, $this->f1comps['A3'], $this->f2comps['A3']); @@ -189,7 +189,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { public function test_remove_when_missing() { $this->setAdminUser(); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_remove_when_mapping_is_missing(true); @@ -215,7 +215,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { public function test_allowed_courses() { $this->setAdminUser(); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_allowedcourses(array($this->c1->id)); @@ -248,7 +248,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { public function test_disallowed_courses() { $this->setAdminUser(); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_disallowedcourses(array($this->c2->id)); @@ -281,7 +281,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { public function test_course_start_date_from() { $this->setAdminUser(); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_course_start_date_from(time()); @@ -316,15 +316,15 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $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())); + $lpg->create_course_competency(array('courseid' => $this->c1->id, 'competencyid' => $this->f2comps['A1']->get('id'))); // Pre-add the new competency to module in course 2. $lpg->create_course_module_competency(array( 'cmid' => $this->cms[$this->c2->id]['F1']->cmid, - 'competencyid' => $this->f2comps['A2']->get_id() + 'competencyid' => $this->f2comps['A2']->get('id') )); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->proceed(); @@ -345,13 +345,13 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $warning = array_shift($warnings); $this->assertEquals($this->c1->id, $warning['courseid']); - $this->assertEquals($this->f1comps['A1']->get_id(), $warning['competencyid']); + $this->assertEquals($this->f1comps['A1']->get('id'), $warning['competencyid']); $this->assertEquals(null, $warning['cmid']); $this->assertRegexp('/competency already exists/', $warning['message']); $warning = array_shift($warnings); $this->assertEquals($this->c2->id, $warning['courseid']); - $this->assertEquals($this->f1comps['A2']->get_id(), $warning['competencyid']); + $this->assertEquals($this->f1comps['A2']->get('id'), $warning['competencyid']); $this->assertEquals($this->cms[$this->c2->id]['F1']->cmid, $warning['cmid']); $this->assertRegexp('/competency already exists/', $warning['message']); @@ -364,15 +364,15 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $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())); + $lpg->create_course_competency(array('courseid' => $this->c1->id, 'competencyid' => $this->f2comps['A1']->get('id'))); // Pre-add the new competency to module in course 2. $lpg->create_course_module_competency(array( 'cmid' => $this->cms[$this->c2->id]['F1']->cmid, - 'competencyid' => $this->f2comps['A2']->get_id() + 'competencyid' => $this->f2comps['A2']->get('id') )); - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_remove_original_when_destination_already_present(true); @@ -414,7 +414,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->setUser($u); // Do C1 first. - $mapper = new framework_mapper($this->f1->get_id(), $this->f2->get_id()); + $mapper = new framework_mapper($this->f1->get('id'), $this->f2->get('id')); $mapper->automap(); $processor = new framework_processor($mapper); $processor->set_allowedcourses(array($this->c1->id)); @@ -434,10 +434,10 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $errors = $processor->get_errors(); $this->assertCount(2, $errors); $this->assertEquals($this->c1->id, $errors[0]['courseid']); - $this->assertEquals($this->f1comps['A1']->get_id(), $errors[0]['competencyid']); + $this->assertEquals($this->f1comps['A1']->get('id'), $errors[0]['competencyid']); $this->assertEquals(null, $errors[0]['cmid']); $this->assertRegexp('/Sorry, but you do not currently have permissions to do that/', $errors[0]['message']); - $this->assertEquals($this->f1comps['A3']->get_id(), $errors[1]['competencyid']); + $this->assertEquals($this->f1comps['A3']->get('id'), $errors[1]['competencyid']); $this->assertCourseCompetencyNotMigrated($this->c1, $this->f1comps['A1'], $this->f2comps['A1']); $this->assertCourseCompetencyNotMigrated($this->c1, $this->f1comps['A3'], $this->f2comps['A3']); @@ -463,10 +463,10 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $errors = $processor->get_errors(); $this->assertCount(2, $errors); $this->assertEquals($this->c2->id, $errors[0]['courseid']); - $this->assertEquals($this->f1comps['A2']->get_id(), $errors[0]['competencyid']); + $this->assertEquals($this->f1comps['A2']->get('id'), $errors[0]['competencyid']); $this->assertEquals($this->cms[$this->c2->id]['F1']->cmid, $errors[0]['cmid']); $this->assertRegexp('/Sorry, but you do not currently have permissions to do that/', $errors[0]['message']); - $this->assertEquals($this->f1comps['A3']->get_id(), $errors[1]['competencyid']); + $this->assertEquals($this->f1comps['A3']->get('id'), $errors[1]['competencyid']); // The new competencies were added to the course, but the old ones were not removed because they are still in modules. $this->assertCourseCompetencyExists($this->c2, $this->f1comps['A2']); @@ -487,7 +487,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { */ protected function assertCourseCompetencyExists($course, $competency) { $this->assertTrue(course_competency::record_exists_select("courseid = :courseid AND competencyid = :competencyid", - array('courseid' => $course->id, 'competencyid' => $competency->get_id()))); + array('courseid' => $course->id, 'competencyid' => $competency->get('id')))); } /** @@ -498,7 +498,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { */ protected function assertCourseCompetencyNotExists($course, $competency) { $this->assertFalse(course_competency::record_exists_select("courseid = :courseid AND competencyid = :competencyid", - array('courseid' => $course->id, 'competencyid' => $competency->get_id()))); + array('courseid' => $course->id, 'competencyid' => $competency->get('id')))); } /** @@ -514,16 +514,16 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->assertCourseCompetencyNotExists($course, $compfrom); $this->assertCourseCompetencyExists($course, $compto); - $before = $ccs[$compfrom->get_id()]; + $before = $ccs[$compfrom->get('id')]; $after = course_competency::get_record(array( 'courseid' => $course->id, - 'competencyid' => $compto->get_id() + 'competencyid' => $compto->get('id') )); - $this->assertNotEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_courseid(), $after->get_courseid()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); - $this->assertEquals($before->get_ruleoutcome(), $after->get_ruleoutcome()); + $this->assertNotEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('courseid'), $after->get('courseid')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); + $this->assertEquals($before->get('ruleoutcome'), $after->get('ruleoutcome')); } /** @@ -539,13 +539,13 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->assertCourseCompetencyExists($course, $compfrom); $this->assertCourseCompetencyNotExists($course, $compto); - $before = $ccs[$compfrom->get_id()]; - $after = $ccs[$compfrom->get_id()]; + $before = $ccs[$compfrom->get('id')]; + $after = $ccs[$compfrom->get('id')]; - $this->assertEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_courseid(), $after->get_courseid()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); - $this->assertEquals($before->get_ruleoutcome(), $after->get_ruleoutcome()); + $this->assertEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('courseid'), $after->get('courseid')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); + $this->assertEquals($before->get('ruleoutcome'), $after->get('ruleoutcome')); } /** @@ -556,7 +556,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { */ protected function assertModuleCompetencyExists($cm, $competency) { $this->assertTrue(course_module_competency::record_exists_select("cmid = :cmid AND competencyid = :competencyid", - array('cmid' => $cm->cmid, 'competencyid' => $competency->get_id()))); + array('cmid' => $cm->cmid, 'competencyid' => $competency->get('id')))); } /** @@ -567,7 +567,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { */ protected function assertModuleCompetencyNotExists($cm, $competency) { $this->assertFalse(course_module_competency::record_exists_select("cmid = :cmid AND competencyid = :competencyid", - array('cmid' => $cm->cmid, 'competencyid' => $competency->get_id()))); + array('cmid' => $cm->cmid, 'competencyid' => $competency->get('id')))); } /** @@ -583,16 +583,16 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->assertModuleCompetencyNotExists($cm, $compfrom); $this->assertModuleCompetencyExists($cm, $compto); - $before = $cmcs[$compfrom->get_id()]; + $before = $cmcs[$compfrom->get('id')]; $after = course_module_competency::get_record(array( 'cmid' => $cm->cmid, - 'competencyid' => $compto->get_id() + 'competencyid' => $compto->get('id') )); - $this->assertNotEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_cmid(), $after->get_cmid()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); - $this->assertEquals($before->get_ruleoutcome(), $after->get_ruleoutcome()); + $this->assertNotEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('cmid'), $after->get('cmid')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); + $this->assertEquals($before->get('ruleoutcome'), $after->get('ruleoutcome')); } /** @@ -608,13 +608,13 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase { $this->assertModuleCompetencyExists($cm, $compfrom); $this->assertModuleCompetencyNotExists($cm, $compto); - $before = $cmcs[$compfrom->get_id()]; - $after = $cmcs[$compfrom->get_id()]; + $before = $cmcs[$compfrom->get('id')]; + $after = $cmcs[$compfrom->get('id')]; - $this->assertEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_cmid(), $after->get_cmid()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); - $this->assertEquals($before->get_ruleoutcome(), $after->get_ruleoutcome()); + $this->assertEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('cmid'), $after->get('cmid')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); + $this->assertEquals($before->get('ruleoutcome'), $after->get('ruleoutcome')); } } diff --git a/competency/classes/api.php b/competency/classes/api.php index a7f8b888c79..60adab4fc77 100644 --- a/competency/classes/api.php +++ b/competency/classes/api.php @@ -165,7 +165,7 @@ class api { require_capability('moodle/competency:competencymanage', $competency->get_context()); // Reset the sortorder, use reorder instead. - $competency->set_sortorder(null); + $competency->set('sortorder', null); $competency->create(); \core\event\competency_created::create_from_competency($competency)->trigger(); @@ -197,7 +197,7 @@ class api { require_capability('moodle/competency:competencymanage', $competency->get_context()); $events = array(); - $competencyids = array(intval($competency->get_id())); + $competencyids = array(intval($competency->get('id'))); $contextid = $competency->get_context()->id; $competencyids = array_merge(competency::get_descendants_ids($competency), $competencyids); if (!competency::can_all_be_deleted($competencyids)) { @@ -257,25 +257,25 @@ class api { // First we do a permissions check. require_capability('moodle/competency:competencymanage', $current->get_context()); - $max = self::count_competencies(array('parentid' => $current->get_parentid(), - 'competencyframeworkid' => $current->get_competencyframeworkid())); + $max = self::count_competencies(array('parentid' => $current->get('parentid'), + 'competencyframeworkid' => $current->get('competencyframeworkid'))); if ($max > 0) { $max--; } - $sortorder = $current->get_sortorder(); + $sortorder = $current->get('sortorder'); if ($sortorder >= $max) { return false; } $sortorder = $sortorder + 1; - $current->set_sortorder($sortorder); + $current->set('sortorder', $sortorder); - $filters = array('parentid' => $current->get_parentid(), - 'competencyframeworkid' => $current->get_competencyframeworkid(), + $filters = array('parentid' => $current->get('parentid'), + 'competencyframeworkid' => $current->get('competencyframeworkid'), 'sortorder' => $sortorder); $children = self::list_competencies($filters, 'id'); foreach ($children as $needtoswap) { - $needtoswap->set_sortorder($sortorder - 1); + $needtoswap->set('sortorder', $sortorder - 1); $needtoswap->update(); } @@ -300,20 +300,20 @@ class api { // First we do a permissions check. require_capability('moodle/competency:competencymanage', $current->get_context()); - $sortorder = $current->get_sortorder(); + $sortorder = $current->get('sortorder'); if ($sortorder == 0) { return false; } $sortorder = $sortorder - 1; - $current->set_sortorder($sortorder); + $current->set('sortorder', $sortorder); - $filters = array('parentid' => $current->get_parentid(), - 'competencyframeworkid' => $current->get_competencyframeworkid(), + $filters = array('parentid' => $current->get('parentid'), + 'competencyframeworkid' => $current->get('competencyframeworkid'), 'sortorder' => $sortorder); $children = self::list_competencies($filters, 'id'); foreach ($children as $needtoswap) { - $needtoswap->set_sortorder($sortorder + 1); + $needtoswap->set('sortorder', $sortorder + 1); $needtoswap->update(); } @@ -341,14 +341,14 @@ class api { require_capability('moodle/competency:competencymanage', $current->get_context()); if ($id == $newparentid) { throw new coding_exception('Can not set a competency as a parent of itself.'); - } if ($newparentid == $current->get_parentid()) { + } if ($newparentid == $current->get('parentid')) { throw new coding_exception('Can not move a competency to the same location.'); } // Some great variable assignment right here. $currentparent = $current->get_parent(); $parent = !empty($newparentid) ? new competency($newparentid) : null; - $parentpath = !empty($parent) ? $parent->get_path() : '/0/'; + $parentpath = !empty($parent) ? $parent->get('path') : '/0/'; // We're going to change quite a few things. $transaction = $DB->start_delegated_transaction(); @@ -358,10 +358,10 @@ class api { // - remove the rule on self. // - re-read the parent. $newparents = explode('/', $parentpath); - if (in_array($current->get_id(), $newparents)) { - $children = competency::get_records(array('parentid' => $current->get_id()), 'id'); + if (in_array($current->get('id'), $newparents)) { + $children = competency::get_records(array('parentid' => $current->get('id')), 'id'); foreach ($children as $child) { - $child->set_parentid($current->get_parentid()); + $child->set('parentid', $current->get('parentid')); $child->update(); } @@ -383,7 +383,7 @@ class api { } // Do the actual move. - $current->set_parentid($newparentid); + $current->set('parentid', $newparentid); $result = $current->update(); // All right, let's commit this. @@ -410,9 +410,9 @@ class api { require_capability('moodle/competency:competencymanage', $competency->get_context()); // Some things should not be changed in an update - they should use a more specific method. - $record->sortorder = $competency->get_sortorder(); - $record->parentid = $competency->get_parentid(); - $record->competencyframeworkid = $competency->get_competencyframeworkid(); + $record->sortorder = $competency->get('sortorder'); + $record->parentid = $competency->get('parentid'); + $record->competencyframeworkid = $competency->get('competencyframeworkid'); $competency->from_record($record); require_capability('moodle/competency:competencymanage', $competency->get_context()); @@ -551,7 +551,7 @@ class api { // Account for different formats of taxonomies. if (isset($record->taxonomies)) { - $framework->set_taxonomies($record->taxonomies); + $framework->set('taxonomies', $record->taxonomies); } $framework = $framework->create(); @@ -581,34 +581,34 @@ class api { try { // Get a uniq idnumber based on the origin framework. - $idnumber = competency_framework::get_unused_idnumber($framework->get_idnumber()); - $framework->set_idnumber($idnumber); + $idnumber = competency_framework::get_unused_idnumber($framework->get('idnumber')); + $framework->set('idnumber', $idnumber); // Adding the suffix copy to the shortname. - $framework->set_shortname(get_string('duplicateditemname', 'core_competency', $framework->get_shortname())); - $framework->set_id(0); + $framework->set('shortname', get_string('duplicateditemname', 'core_competency', $framework->get('shortname'))); + $framework->set('id', 0); $framework = $framework->create(); // Array that match the old competencies ids with the new one to use when copying related competencies. $frameworkcompetency = competency::get_framework_tree($id); - $matchids = self::duplicate_competency_tree($framework->get_id(), $frameworkcompetency, 0, 0); + $matchids = self::duplicate_competency_tree($framework->get('id'), $frameworkcompetency, 0, 0); // Copy the related competencies. $relcomps = related_competency::get_multiple_relations(array_keys($matchids)); foreach ($relcomps as $relcomp) { - $compid = $relcomp->get_competencyid(); - $relcompid = $relcomp->get_relatedcompetencyid(); + $compid = $relcomp->get('competencyid'); + $relcompid = $relcomp->get('relatedcompetencyid'); if (isset($matchids[$compid]) && isset($matchids[$relcompid])) { - $newcompid = $matchids[$compid]->get_id(); - $newrelcompid = $matchids[$relcompid]->get_id(); + $newcompid = $matchids[$compid]->get('id'); + $newrelcompid = $matchids[$relcompid]->get('id'); if ($newcompid < $newrelcompid) { - $relcomp->set_competencyid($newcompid); - $relcomp->set_relatedcompetencyid($newrelcompid); + $relcomp->set('competencyid', $newcompid); + $relcomp->set('relatedcompetencyid', $newrelcompid); } else { - $relcomp->set_competencyid($newrelcompid); - $relcomp->set_relatedcompetencyid($newcompid); + $relcomp->set('competencyid', $newrelcompid); + $relcomp->set('relatedcompetencyid', $newcompid); } - $relcomp->set_id(0); + $relcomp->set('id', 0); $relcomp->create(); } else { // Debugging message when there is no match found. @@ -647,7 +647,7 @@ class api { $events = array(); $competenciesid = competency::get_ids_by_frameworkid($id); - $contextid = $framework->get_contextid(); + $contextid = $framework->get('contextid'); if (!competency::can_all_be_deleted($competenciesid)) { return false; } @@ -707,7 +707,7 @@ class api { // Account for different formats of taxonomies. $framework->from_record($record); if (isset($record->taxonomies)) { - $framework->set_taxonomies($record->taxonomies); + $framework->set('taxonomies', $record->taxonomies); } // Trigger a competency framework updated event. @@ -1129,7 +1129,7 @@ class api { // Build the return values. foreach ($coursecompetencies as $key => $coursecompetency) { $result[] = array( - 'competency' => $competencies[$coursecompetency->get_competencyid()], + 'competency' => $competencies[$coursecompetency->get('competencyid')], 'coursecompetency' => $coursecompetency ); } @@ -1211,7 +1211,7 @@ class api { // Build the return values. foreach ($coursemodulecompetencies as $key => $coursemodulecompetency) { $result[] = array( - 'competency' => $competencies[$coursemodulecompetency->get_competencyid()], + 'competency' => $competencies[$coursemodulecompetency->get('competencyid')], 'coursemodulecompetency' => $coursemodulecompetency ); } @@ -1248,7 +1248,7 @@ class api { if ($exists) { $ucc = $exists; } else { - $ucc = user_competency_course::create_relation($userid, $competency->get_id(), $courseid); + $ucc = user_competency_course::create_relation($userid, $competency->get('id'), $courseid); $ucc->create(); } @@ -1286,16 +1286,16 @@ class api { foreach ($competencylist as $coursecompetency) { $found = false; foreach ($existing as $usercompetencycourse) { - if ($usercompetencycourse->get_competencyid() == $coursecompetency->get_id()) { + if ($usercompetencycourse->get('competencyid') == $coursecompetency->get('id')) { $found = true; - $orderedusercompetencycourses[$usercompetencycourse->get_id()] = $usercompetencycourse; + $orderedusercompetencycourses[$usercompetencycourse->get('id')] = $usercompetencycourse; break; } } if (!$found) { - $ucc = user_competency_course::create_relation($userid, $coursecompetency->get_id(), $courseid); + $ucc = user_competency_course::create_relation($userid, $coursecompetency->get('id'), $courseid); $ucc->create(); - $orderedusercompetencycourses[$ucc->get_id()] = $ucc; + $orderedusercompetencycourses[$ucc->get('id')] = $ucc; } } @@ -1506,22 +1506,22 @@ class api { $all = course_module_competency::get_records(array('cmid' => $cm->id), 'sortorder', 'ASC', 0, 0); - if ($competencyfrom->get_sortorder() > $competencyto->get_sortorder()) { + if ($competencyfrom->get('sortorder') > $competencyto->get('sortorder')) { // We are moving up, so put it before the "to" item. $down = false; } foreach ($all as $id => $coursemodulecompetency) { - $sort = $coursemodulecompetency->get_sortorder(); - if ($down && $sort > $competencyfrom->get_sortorder() && $sort <= $competencyto->get_sortorder()) { - $coursemodulecompetency->set_sortorder($coursemodulecompetency->get_sortorder() - 1); + $sort = $coursemodulecompetency->get('sortorder'); + if ($down && $sort > $competencyfrom->get('sortorder') && $sort <= $competencyto->get('sortorder')) { + $coursemodulecompetency->set('sortorder', $coursemodulecompetency->get('sortorder') - 1); $coursemodulecompetency->update(); - } else if (!$down && $sort >= $competencyto->get_sortorder() && $sort < $competencyfrom->get_sortorder()) { - $coursemodulecompetency->set_sortorder($coursemodulecompetency->get_sortorder() + 1); + } else if (!$down && $sort >= $competencyto->get('sortorder') && $sort < $competencyfrom->get('sortorder')) { + $coursemodulecompetency->set('sortorder', $coursemodulecompetency->get('sortorder') + 1); $coursemodulecompetency->update(); } } - $competencyfrom->set_sortorder($competencyto->get_sortorder()); + $competencyfrom->set('sortorder', $competencyto->get('sortorder')); return $competencyfrom->update(); } @@ -1539,14 +1539,14 @@ class api { $coursemodulecompetency = new course_module_competency($coursemodulecompetencyorid); } - $cm = get_coursemodule_from_id('', $coursemodulecompetency->get_cmid(), 0, true, MUST_EXIST); + $cm = get_coursemodule_from_id('', $coursemodulecompetency->get('cmid'), 0, true, MUST_EXIST); self::validate_course_module($cm); $context = context_module::instance($cm->id); require_capability('moodle/competency:coursecompetencymanage', $context); - $coursemodulecompetency->set_ruleoutcome($ruleoutcome); + $coursemodulecompetency->set('ruleoutcome', $ruleoutcome); return $coursemodulecompetency->update(); } @@ -1574,7 +1574,7 @@ class api { $competency = new competency($competencyid); // Can not add a competency that belong to a hidden framework. - if ($competency->get_framework()->get_visible() == false) { + if ($competency->get_framework()->get('visible') == false) { throw new coding_exception('A competency belonging to hidden framework can not be linked to course'); } @@ -1660,22 +1660,22 @@ class api { $all = $coursecompetency->get_records(array('courseid' => $courseid), 'sortorder', 'ASC', 0, 0); - if ($competencyfrom->get_sortorder() > $competencyto->get_sortorder()) { + if ($competencyfrom->get('sortorder') > $competencyto->get('sortorder')) { // We are moving up, so put it before the "to" item. $down = false; } foreach ($all as $id => $coursecompetency) { - $sort = $coursecompetency->get_sortorder(); - if ($down && $sort > $competencyfrom->get_sortorder() && $sort <= $competencyto->get_sortorder()) { - $coursecompetency->set_sortorder($coursecompetency->get_sortorder() - 1); + $sort = $coursecompetency->get('sortorder'); + if ($down && $sort > $competencyfrom->get('sortorder') && $sort <= $competencyto->get('sortorder')) { + $coursecompetency->set('sortorder', $coursecompetency->get('sortorder') - 1); $coursecompetency->update(); - } else if (!$down && $sort >= $competencyto->get_sortorder() && $sort < $competencyfrom->get_sortorder()) { - $coursecompetency->set_sortorder($coursecompetency->get_sortorder() + 1); + } else if (!$down && $sort >= $competencyto->get('sortorder') && $sort < $competencyfrom->get('sortorder')) { + $coursecompetency->set('sortorder', $coursecompetency->get('sortorder') + 1); $coursecompetency->update(); } } - $competencyfrom->set_sortorder($competencyto->get_sortorder()); + $competencyfrom->set('sortorder', $competencyto->get('sortorder')); return $competencyfrom->update(); } @@ -1693,13 +1693,13 @@ class api { $coursecompetency = new course_competency($coursecompetencyorid); } - $courseid = $coursecompetency->get_courseid(); + $courseid = $coursecompetency->get('courseid'); self::validate_course($courseid); $coursecontext = context_course::instance($courseid); require_capability('moodle/competency:coursecompetencymanage', $coursecontext); - $coursecompetency->set_ruleoutcome($ruleoutcome); + $coursecompetency->set('ruleoutcome', $ruleoutcome); return $coursecompetency->update(); } @@ -1752,14 +1752,14 @@ class api { $competencies = template_competency::list_competencies($id, false); // Adding the suffix copy. - $template->set_shortname(get_string('duplicateditemname', 'core_competency', $template->get_shortname())); - $template->set_id(0); + $template->set('shortname', get_string('duplicateditemname', 'core_competency', $template->get('shortname'))); + $template->set('id', 0); $duplicatedtemplate = $template->create(); // Associate each competency for the duplicated template. foreach ($competencies as $competency) { - self::add_competency_to_template($duplicatedtemplate->get_id(), $competency->get_id()); + self::add_competency_to_template($duplicatedtemplate->get('id'), $competency->get('id')); } // Trigger a template created event. @@ -1793,7 +1793,7 @@ class api { $success = true; // Check if there are cohorts associated. - $templatecohorts = template_cohort::get_relations_by_templateid($template->get_id()); + $templatecohorts = template_cohort::get_relations_by_templateid($template->get('id')); foreach ($templatecohorts as $templatecohort) { $success = $templatecohort->delete(); if (!$success) { @@ -1803,9 +1803,9 @@ class api { // Still OK, delete or unlink the plans from the template. if ($success) { - $plans = plan::get_records(array('templateid' => $template->get_id())); + $plans = plan::get_records(array('templateid' => $template->get('id'))); foreach ($plans as $plan) { - $success = $deleteplans ? self::delete_plan($plan->get_id()) : self::unlink_plan_from_template($plan); + $success = $deleteplans ? self::delete_plan($plan->get('id')) : self::unlink_plan_from_template($plan); if (!$success) { break; } @@ -1814,7 +1814,7 @@ class api { // Still OK, delete the template comptencies. if ($success) { - $success = template_competency::delete_by_templateid($template->get_id()); + $success = template_competency::delete_by_templateid($template->get('id')); } // OK - all set. @@ -1856,7 +1856,7 @@ class api { throw new required_capability_exception($template->get_context(), 'moodle/competency:templatemanage', 'nopermissions', ''); - } else if (isset($record->contextid) && $record->contextid != $template->get_contextid()) { + } else if (isset($record->contextid) && $record->contextid != $template->get('contextid')) { // We can never change the context of a template. throw new coding_exception('Changing the context of an existing tempalte is forbidden.'); @@ -2070,7 +2070,7 @@ class api { } // OK - all set. - return template_competency::count_competencies($template->get_id()); + return template_competency::count_competencies($template->get('id')); } /** @@ -2092,7 +2092,7 @@ class api { } // OK - all set. - return template_competency::count_competencies_with_no_courses($template->get_id()); + return template_competency::count_competencies_with_no_courses($template->get('id')); } /** @@ -2115,7 +2115,7 @@ class api { } // OK - all set. - return template_competency::list_competencies($template->get_id()); + return template_competency::list_competencies($template->get('id')); } /** @@ -2141,7 +2141,7 @@ class api { $competency = new competency($competencyid); // Can not add a competency that belong to a hidden framework. - if ($competency->get_framework()->get_visible() == false) { + if ($competency->get_framework()->get('visible') == false) { throw new coding_exception('A competency belonging to hidden framework can not be added'); } @@ -2220,22 +2220,22 @@ class api { $all = template_competency::get_records(array('templateid' => $templateid), 'sortorder', 'ASC', 0, 0); - if ($competencyfrom->get_sortorder() > $competencyto->get_sortorder()) { + if ($competencyfrom->get('sortorder') > $competencyto->get('sortorder')) { // We are moving up, so put it before the "to" item. $down = false; } foreach ($all as $id => $templatecompetency) { - $sort = $templatecompetency->get_sortorder(); - if ($down && $sort > $competencyfrom->get_sortorder() && $sort <= $competencyto->get_sortorder()) { - $templatecompetency->set_sortorder($templatecompetency->get_sortorder() - 1); + $sort = $templatecompetency->get('sortorder'); + if ($down && $sort > $competencyfrom->get('sortorder') && $sort <= $competencyto->get('sortorder')) { + $templatecompetency->set('sortorder', $templatecompetency->get('sortorder') - 1); $templatecompetency->update(); - } else if (!$down && $sort >= $competencyto->get_sortorder() && $sort < $competencyfrom->get_sortorder()) { - $templatecompetency->set_sortorder($templatecompetency->get_sortorder() + 1); + } else if (!$down && $sort >= $competencyto->get('sortorder') && $sort < $competencyfrom->get('sortorder')) { + $templatecompetency->set('sortorder', $templatecompetency->get('sortorder') + 1); $templatecompetency->update(); } } - $competencyfrom->set_sortorder($competencyto->get_sortorder()); + $competencyfrom->set('sortorder', $competencyto->get('sortorder')); return $competencyfrom->update(); } @@ -2269,8 +2269,8 @@ class api { throw new required_capability_exception($cohortcontext, 'moodle/cohort:view', 'nopermissions', ''); } - $tplcohort = template_cohort::get_relation($template->get_id(), $cohort->id); - if (!$tplcohort->get_id()) { + $tplcohort = template_cohort::get_relation($template->get('id'), $cohort->id); + if (!$tplcohort->get('id')) { $tplcohort->create(); } @@ -2299,8 +2299,8 @@ class api { $cohort = $DB->get_record('cohort', array('id' => $cohort), '*', MUST_EXIST); } - $tplcohort = template_cohort::get_relation($template->get_id(), $cohort->id); - if (!$tplcohort->get_id()) { + $tplcohort = template_cohort::get_relation($template->get('id'), $cohort->id); + if (!$tplcohort->get('id')) { return true; } @@ -2452,12 +2452,12 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('To create a plan from a template use api::create_plan_from_template().'); - } else if ($plan->get_status() == plan::STATUS_COMPLETE) { + } else if ($plan->get('status') == plan::STATUS_COMPLETE) { throw new coding_exception('A plan cannot be created as complete.'); } if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } @@ -2488,7 +2488,7 @@ class api { 'nopermissions', ''); } // Can not create plan from a hidden template. - if ($template->get_visible() == false) { + if ($template->get('visible') == false) { throw new coding_exception('A plan can not be created from a hidden template'); } @@ -2521,7 +2521,7 @@ class api { // We first apply the permission checks as we wouldn't want to leak information by returning early that // the plan already exists. if (plan::record_exists_select('templateid = :templateid AND userid = :userid', array( - 'templateid' => $template->get_id(), 'userid' => $userid))) { + 'templateid' => $template->get('id'), 'userid' => $userid))) { return false; } @@ -2557,7 +2557,7 @@ class api { } // Can not create plan from a hidden template. - if ($template->get_visible() == false) { + if ($template->get('visible') == false) { throw new coding_exception('A plan can not be created from a hidden template'); } @@ -2589,7 +2589,7 @@ class api { // Create the plans. $created = 0; - $userids = template_cohort::get_missing_plans($template->get_id(), $cohortid, $recreateunlinked); + $userids = template_cohort::get_missing_plans($template->get('id'), $cohortid, $recreateunlinked); foreach ($userids as $userid) { $record = (object) (array) $recordbase; $record->userid = $userid; @@ -2630,7 +2630,7 @@ class api { } // Only plan with status DRAFT or ACTIVE can be unliked.. - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { throw new coding_exception('Only draft or active plan can be unliked from a template'); } @@ -2640,23 +2640,23 @@ class api { } // Fetch the template. - $template = new template($plan->get_templateid()); + $template = new template($plan->get('templateid')); // Now, proceed by copying all competencies to the plan, then update the plan. $transaction = $DB->start_delegated_transaction(); - $competencies = template_competency::list_competencies($template->get_id(), false); + $competencies = template_competency::list_competencies($template->get('id'), false); $i = 0; foreach ($competencies as $competency) { $record = (object) array( - 'planid' => $plan->get_id(), - 'competencyid' => $competency->get_id(), + 'planid' => $plan->get('id'), + 'competencyid' => $competency->get('id'), 'sortorder' => $i++ ); $pc = new plan_competency(null, $record); $pc->create(); } - $plan->set_origtemplateid($template->get_id()); - $plan->set_templateid(null); + $plan->set('origtemplateid', $template->get('id')); + $plan->set('templateid', null); $success = $plan->update(); $transaction->allow_commit(); @@ -2681,7 +2681,7 @@ class api { if (!$plan->can_manage()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); - } else if ($plan->get_status() == plan::STATUS_COMPLETE) { + } else if ($plan->get('status') == plan::STATUS_COMPLETE) { // A completed plan cannot be edited. throw new coding_exception('Completed plan cannot be edited.'); @@ -2689,15 +2689,15 @@ class api { // Prevent a plan based on a template to be edited. throw new coding_exception('Cannot update a plan that is based on a template.'); - } else if (isset($record->templateid) && $plan->get_templateid() != $record->templateid) { + } else if (isset($record->templateid) && $plan->get('templateid') != $record->templateid) { // Prevent a plan to be based on a template. throw new coding_exception('Cannot base a plan on a template.'); - } else if (isset($record->userid) && $plan->get_userid() != $record->userid) { + } else if (isset($record->userid) && $plan->get('userid') != $record->userid) { // Prevent change of ownership as the capabilities are checked against that. throw new coding_exception('A plan cannot be transfered to another user'); - } else if (isset($record->status) && $plan->get_status() != $record->status) { + } else if (isset($record->status) && $plan->get('status') != $record->status) { // Prevent change of status. throw new coding_exception('To change the status of a plan use the appropriate methods.'); @@ -2723,7 +2723,7 @@ class api { $plan = new plan($id); if (!$plan->can_read()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planview', 'nopermissions', ''); } @@ -2745,7 +2745,7 @@ class api { // First we do a permissions check. if (!$plan->can_read()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planview', 'nopermissions', ''); } @@ -2770,7 +2770,7 @@ class api { $plan = new plan($id); if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } @@ -2778,13 +2778,13 @@ class api { $transaction = $DB->start_delegated_transaction(); // Delete plan competencies. - $plancomps = plan_competency::get_records(array('planid' => $plan->get_id())); + $plancomps = plan_competency::get_records(array('planid' => $plan->get('id'))); foreach ($plancomps as $plancomp) { $plancomp->delete(); } // Delete archive user competencies if the status of the plan is complete. - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { self::remove_archived_user_competencies_in_plan($plan); } $event = \core\event\competency_plan_deleted::create_from_plan($plan); @@ -2818,13 +2818,13 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('Template plans cannot be reviewed.'); // This should never happen. - } else if ($plan->get_status() != plan::STATUS_WAITING_FOR_REVIEW) { + } else if ($plan->get('status') != plan::STATUS_WAITING_FOR_REVIEW) { throw new coding_exception('The plan review cannot be cancelled at this stage.'); } else if (!$plan->can_request_review()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); $result = $plan->update(); // Trigger review request cancelled event. @@ -2853,13 +2853,13 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('Template plans cannot be reviewed.'); // This should never happen. - } else if ($plan->get_status() != plan::STATUS_DRAFT) { + } else if ($plan->get('status') != plan::STATUS_DRAFT) { throw new coding_exception('The plan cannot be sent for review at this stage.'); } else if (!$plan->can_request_review()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $result = $plan->update(); // Trigger review requested event. @@ -2889,14 +2889,14 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('Template plans cannot be reviewed.'); // This should never happen. - } else if ($plan->get_status() != plan::STATUS_WAITING_FOR_REVIEW) { + } else if ($plan->get('status') != plan::STATUS_WAITING_FOR_REVIEW) { throw new coding_exception('The plan review cannot be started at this stage.'); } else if (!$plan->can_review()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_IN_REVIEW); - $plan->set_reviewerid($USER->id); + $plan->set('status', plan::STATUS_IN_REVIEW); + $plan->set('reviewerid', $USER->id); $result = $plan->update(); // Trigger review started event. @@ -2925,14 +2925,14 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('Template plans cannot be reviewed.'); // This should never happen. - } else if ($plan->get_status() != plan::STATUS_IN_REVIEW) { + } else if ($plan->get('status') != plan::STATUS_IN_REVIEW) { throw new coding_exception('The plan review cannot be stopped at this stage.'); } else if (!$plan->can_review()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_DRAFT); - $plan->set_reviewerid(null); + $plan->set('status', plan::STATUS_DRAFT); + $plan->set('reviewerid', null); $result = $plan->update(); // Trigger review stopped event. @@ -2970,8 +2970,8 @@ class api { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_ACTIVE); - $plan->set_reviewerid(null); + $plan->set('status', plan::STATUS_ACTIVE); + $plan->set('reviewerid', null); $result = $plan->update(); // Trigger approved event. @@ -3002,13 +3002,13 @@ class api { if ($plan->is_based_on_template()) { throw new coding_exception('Template plans are always approved.'); // This should never happen. - } else if ($plan->get_status() != plan::STATUS_ACTIVE) { + } else if ($plan->get('status') != plan::STATUS_ACTIVE) { throw new coding_exception('The plan cannot be sent back to draft at this stage.'); } else if (!$plan->can_review()) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:planmanage', 'nopermissions', ''); } - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); $result = $plan->update(); // Trigger unapproved event. @@ -3038,12 +3038,12 @@ class api { } // Check if the plan was already completed. - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { throw new coding_exception('The plan is already completed.'); } - $originalstatus = $plan->get_status(); - $plan->set_status(plan::STATUS_COMPLETE); + $originalstatus = $plan->get('status'); + $plan->set('status', plan::STATUS_COMPLETE); // The user should also be able to manage the plan when it's completed. if (!$plan->can_manage()) { @@ -3051,12 +3051,12 @@ class api { } // Put back original status because archive needs it to extract competencies from the right table. - $plan->set_status($originalstatus); + $plan->set('status', $originalstatus); // Do the things. $transaction = $DB->start_delegated_transaction(); self::archive_user_competencies_in_plan($plan); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); $success = $plan->update(); if (!$success) { @@ -3089,16 +3089,16 @@ class api { // Validate that the plan as it is can be managed. if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } - $beforestatus = $plan->get_status(); - $plan->set_status(plan::STATUS_ACTIVE); + $beforestatus = $plan->get('status'); + $plan->set('status', plan::STATUS_ACTIVE); // Validate if status can be changed. if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } @@ -3106,14 +3106,14 @@ class api { $transaction = $DB->start_delegated_transaction(); // Delete archived user competencies if the status of the plan is changed from complete to another status. - $mustremovearchivedcompetencies = ($beforestatus == plan::STATUS_COMPLETE && $plan->get_status() != plan::STATUS_COMPLETE); + $mustremovearchivedcompetencies = ($beforestatus == plan::STATUS_COMPLETE && $plan->get('status') != plan::STATUS_COMPLETE); if ($mustremovearchivedcompetencies) { self::remove_archived_user_competencies_in_plan($plan); } // If duedate less than or equal to duedate_threshold unset it. - if ($plan->get_duedate() <= time() + plan::DUEDATE_THRESHOLD) { - $plan->set_duedate(0); + if ($plan->get('duedate') <= time() + plan::DUEDATE_THRESHOLD) { + $plan->set('duedate', 0); } $success = $plan->update(); @@ -3150,7 +3150,7 @@ class api { $plan = new plan($planorid); } - if (!user_competency::can_read_user($plan->get_userid())) { + if (!user_competency::can_read_user($plan->get('userid'))) { throw new required_capability_exception($plan->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', ''); } @@ -3158,12 +3158,12 @@ class api { $competency = $plan->get_competency($competencyid); // Get user competencies from user_competency_plan if the plan status is set to complete. - $iscompletedplan = $plan->get_status() == plan::STATUS_COMPLETE; + $iscompletedplan = $plan->get('status') == plan::STATUS_COMPLETE; if ($iscompletedplan) { - $usercompetencies = user_competency_plan::get_multiple($plan->get_userid(), $plan->get_id(), array($competencyid)); + $usercompetencies = user_competency_plan::get_multiple($plan->get('userid'), $plan->get('id'), array($competencyid)); $ucresultkey = 'usercompetencyplan'; } else { - $usercompetencies = user_competency::get_multiple($plan->get_userid(), array($competencyid)); + $usercompetencies = user_competency::get_multiple($plan->get('userid'), array($competencyid)); $ucresultkey = 'usercompetency'; } @@ -3175,7 +3175,7 @@ class api { if ($iscompletedplan) { throw new coding_exception('A user competency plan is missing'); } else { - $uc = user_competency::create_relation($plan->get_userid(), $competency->get_id()); + $uc = user_competency::create_relation($plan->get('userid'), $competency->get('id')); $uc->create(); } } @@ -3209,7 +3209,7 @@ class api { } if (!$plan->can_read()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planview', 'nopermissions', ''); } @@ -3217,12 +3217,12 @@ class api { $competencies = $plan->get_competencies(); // Get user competencies from user_competency_plan if the plan status is set to complete. - $iscompletedplan = $plan->get_status() == plan::STATUS_COMPLETE; + $iscompletedplan = $plan->get('status') == plan::STATUS_COMPLETE; if ($iscompletedplan) { - $usercompetencies = user_competency_plan::get_multiple($plan->get_userid(), $plan->get_id(), $competencies); + $usercompetencies = user_competency_plan::get_multiple($plan->get('userid'), $plan->get('id'), $competencies); $ucresultkey = 'usercompetencyplan'; } else { - $usercompetencies = user_competency::get_multiple($plan->get_userid(), $competencies); + $usercompetencies = user_competency::get_multiple($plan->get('userid'), $competencies); $ucresultkey = 'usercompetency'; } @@ -3231,7 +3231,7 @@ class api { $found = false; foreach ($usercompetencies as $uckey => $uc) { - if ($uc->get_competencyid() == $competency->get_id()) { + if ($uc->get('competencyid') == $competency->get('id')) { $found = true; unset($usercompetencies[$uckey]); break; @@ -3242,7 +3242,7 @@ class api { if ($iscompletedplan) { throw new coding_exception('A user competency plan is missing'); } else { - $uc = user_competency::create_relation($plan->get_userid(), $competency->get_id()); + $uc = user_competency::create_relation($plan->get('userid'), $competency->get('id')); } } @@ -3284,7 +3284,7 @@ class api { $competency = new competency($competencyid); // Can not add a competency that belong to a hidden framework. - if ($competency->get_framework()->get_visible() == false) { + if ($competency->get_framework()->get('visible') == false) { throw new coding_exception('A competency belonging to hidden framework can not be added'); } @@ -3313,7 +3313,7 @@ class api { // First we do a permissions check. if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } else if ($plan->is_based_on_template()) { @@ -3347,7 +3347,7 @@ class api { // First we do a permissions check. if (!$plan->can_manage()) { - $context = context_user::instance($plan->get_userid()); + $context = context_user::instance($plan->get('userid')); throw new required_capability_exception($context, 'moodle/competency:planmanage', 'nopermissions', ''); } else if ($plan->is_based_on_template()) { @@ -3374,22 +3374,22 @@ class api { $all = plan_competency::get_records(array('planid' => $planid), 'sortorder', 'ASC', 0, 0); - if ($competencyfrom->get_sortorder() > $competencyto->get_sortorder()) { + if ($competencyfrom->get('sortorder') > $competencyto->get('sortorder')) { // We are moving up, so put it before the "to" item. $down = false; } foreach ($all as $id => $plancompetency) { - $sort = $plancompetency->get_sortorder(); - if ($down && $sort > $competencyfrom->get_sortorder() && $sort <= $competencyto->get_sortorder()) { - $plancompetency->set_sortorder($plancompetency->get_sortorder() - 1); + $sort = $plancompetency->get('sortorder'); + if ($down && $sort > $competencyfrom->get('sortorder') && $sort <= $competencyto->get('sortorder')) { + $plancompetency->set('sortorder', $plancompetency->get('sortorder') - 1); $plancompetency->update(); - } else if (!$down && $sort >= $competencyto->get_sortorder() && $sort < $competencyfrom->get_sortorder()) { - $plancompetency->set_sortorder($plancompetency->get_sortorder() + 1); + } else if (!$down && $sort >= $competencyto->get('sortorder') && $sort < $competencyfrom->get('sortorder')) { + $plancompetency->set('sortorder', $plancompetency->get('sortorder') + 1); $plancompetency->update(); } } - $competencyfrom->set_sortorder($competencyto->get_sortorder()); + $competencyfrom->set('sortorder', $competencyto->get('sortorder')); return $competencyfrom->update(); } @@ -3406,13 +3406,13 @@ class api { $uc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $competencyid)); if (!$uc || !$uc->can_read()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyview', 'nopermissions', ''); - } else if ($uc->get_status() != user_competency::STATUS_WAITING_FOR_REVIEW) { + } else if ($uc->get('status') != user_competency::STATUS_WAITING_FOR_REVIEW) { throw new coding_exception('The competency can not be cancel review request at this stage.'); } else if (!$uc->can_request_review()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyrequestreview', 'nopermissions', ''); } - $uc->set_status(user_competency::STATUS_IDLE); + $uc->set('status', user_competency::STATUS_IDLE); $result = $uc->update(); if ($result) { \core\event\competency_user_competency_review_request_cancelled::create_from_user_competency($uc)->trigger(); @@ -3438,14 +3438,14 @@ class api { if (!$uc->can_read()) { throw new required_capability_exception($uc->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', ''); - } else if ($uc->get_status() != user_competency::STATUS_IDLE) { + } else if ($uc->get('status') != user_competency::STATUS_IDLE) { throw new coding_exception('The competency can not be sent for review at this stage.'); } else if (!$uc->can_request_review()) { throw new required_capability_exception($uc->get_context(), 'moodle/competency:usercompetencyrequestreview', 'nopermissions', ''); } - $uc->set_status(user_competency::STATUS_WAITING_FOR_REVIEW); + $uc->set('status', user_competency::STATUS_WAITING_FOR_REVIEW); $result = $uc->update(); if ($result) { \core\event\competency_user_competency_review_requested::create_from_user_competency($uc)->trigger(); @@ -3468,14 +3468,14 @@ class api { $uc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $competencyid)); if (!$uc || !$uc->can_read()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyview', 'nopermissions', ''); - } else if ($uc->get_status() != user_competency::STATUS_WAITING_FOR_REVIEW) { + } else if ($uc->get('status') != user_competency::STATUS_WAITING_FOR_REVIEW) { throw new coding_exception('The competency review can not be started at this stage.'); } else if (!$uc->can_review()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyreview', 'nopermissions', ''); } - $uc->set_status(user_competency::STATUS_IN_REVIEW); - $uc->set_reviewerid($USER->id); + $uc->set('status', user_competency::STATUS_IN_REVIEW); + $uc->set('reviewerid', $USER->id); $result = $uc->update(); if ($result) { \core\event\competency_user_competency_review_started::create_from_user_competency($uc)->trigger(); @@ -3496,13 +3496,13 @@ class api { $uc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $competencyid)); if (!$uc || !$uc->can_read()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyview', 'nopermissions', ''); - } else if ($uc->get_status() != user_competency::STATUS_IN_REVIEW) { + } else if ($uc->get('status') != user_competency::STATUS_IN_REVIEW) { throw new coding_exception('The competency review can not be stopped at this stage.'); } else if (!$uc->can_review()) { throw new required_capability_exception($context, 'moodle/competency:usercompetencyreview', 'nopermissions', ''); } - $uc->set_status(user_competency::STATUS_IDLE); + $uc->set('status', user_competency::STATUS_IDLE); $result = $uc->update(); if ($result) { \core\event\competency_user_competency_review_stopped::create_from_user_competency($uc)->trigger(); @@ -3551,7 +3551,7 @@ class api { 'nopermissions', ''); } $plan = new plan($planid); - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { throw new coding_exception('To log the user competency in completed plan use user_competency_plan_viewed method.'); } @@ -3573,13 +3573,13 @@ class api { $ucc = new user_competency_course($ucc); } - if (!$ucc || !user_competency::can_read_user_in_course($ucc->get_userid(), $ucc->get_courseid())) { + if (!$ucc || !user_competency::can_read_user_in_course($ucc->get('userid'), $ucc->get('courseid'))) { throw new required_capability_exception($ucc->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', ''); } // Validate the course, this will throw an exception if not valid. - self::validate_course($ucc->get_courseid()); + self::validate_course($ucc->get('courseid')); \core\event\competency_user_competency_viewed_in_course::create_from_user_competency_viewed_in_course($ucc)->trigger(); return true; @@ -3598,12 +3598,12 @@ class api { $ucp = new user_competency_plan($ucp); } - if (!$ucp || !user_competency::can_read_user($ucp->get_userid())) { + if (!$ucp || !user_competency::can_read_user($ucp->get('userid'))) { throw new required_capability_exception($ucp->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', ''); } - $plan = new plan($ucp->get_planid()); - if ($plan->get_status() != plan::STATUS_COMPLETE) { + $plan = new plan($ucp->get('planid')); + if ($plan->get('status') != plan::STATUS_COMPLETE) { throw new coding_exception('To log the user competency in non-completed plan use ' . 'user_competency_viewed_in_plan method.'); } @@ -3665,8 +3665,8 @@ class api { require_capability('moodle/competency:competencymanage', $competency1->get_context()); - $relatedcompetency = related_competency::get_relation($competency1->get_id(), $competency2->get_id()); - if (!$relatedcompetency->get_id()) { + $relatedcompetency = related_competency::get_relation($competency1->get('id'), $competency2->get('id')); + if (!$relatedcompetency->get('id')) { $relatedcompetency->create(); return true; } @@ -3690,7 +3690,7 @@ class api { require_capability('moodle/competency:competencymanage', $competency->get_context()); $relatedcompetency = related_competency::get_relation($competencyid, $relatedcompetencyid); - if ($relatedcompetency->get_id()) { + if ($relatedcompetency->get('id')) { return $relatedcompetency->delete(); } @@ -3734,7 +3734,7 @@ class api { $userevidence->create(); if (!empty($draftitemid)) { $fileareaoptions = array('subdirs' => true); - $itemid = $userevidence->get_id(); + $itemid = $userevidence->get('id'); file_save_draft_area_files($draftitemid, $context->id, 'core_competency', 'userevidence', $itemid, $fileareaoptions); } @@ -3759,7 +3759,7 @@ class api { if (!$userevidence->can_manage()) { throw new required_capability_exception($context, 'moodle/competency:userevidencemanage', 'nopermissions', ''); - } else if (array_key_exists('userid', $data) && $data->userid != $userevidence->get_userid()) { + } else if (array_key_exists('userid', $data) && $data->userid != $userevidence->get('userid')) { throw new coding_exception('Can not change the userid of a user evidence.'); } @@ -3768,7 +3768,7 @@ class api { if (!empty($draftitemid)) { $fileareaoptions = array('subdirs' => true); - $itemid = $userevidence->get_id(); + $itemid = $userevidence->get('id'); file_save_draft_area_files($draftitemid, $context->id, 'core_competency', 'userevidence', $itemid, $fileareaoptions); } @@ -3801,16 +3801,16 @@ class api { $fs->delete_area_files($context->id, 'core_competency', 'userevidence', $id); // Delete relation between evidence and competencies. - $userevidence->set_id($id); // Restore the ID to fully mock the object. + $userevidence->set('id', $id); // Restore the ID to fully mock the object. $competencies = user_evidence_competency::get_competencies_by_userevidenceid($id); foreach ($competencies as $competency) { - static::delete_user_evidence_competency($userevidence, $competency->get_id()); + static::delete_user_evidence_competency($userevidence, $competency->get('id')); } // Trigger an evidence of prior learning deleted event. \core\event\competency_user_evidence_deleted::create_from_user_evidence($userevidence)->trigger(); - $userevidence->set_id(0); // Restore the object. + $userevidence->set('id', 0); // Restore the object. return true; } @@ -3858,19 +3858,19 @@ class api { $competency = self::read_competency($competencyid); // Get (and create) the relation. - $relation = user_evidence_competency::get_relation($userevidence->get_id(), $competency->get_id()); - if (!$relation->get_id()) { + $relation = user_evidence_competency::get_relation($userevidence->get('id'), $competency->get('id')); + if (!$relation->get('id')) { $relation->create(); - $link = url::user_evidence($userevidence->get_id()); + $link = url::user_evidence($userevidence->get('id')); self::add_evidence( - $userevidence->get_userid(), + $userevidence->get('userid'), $competency, $userevidence->get_context(), evidence::ACTION_LOG, 'evidence_evidenceofpriorlearninglinked', 'core_competency', - $userevidence->get_name(), + $userevidence->get('name'), false, $link->out(false), null, @@ -3904,21 +3904,21 @@ class api { } // Get (and delete) the relation. - $relation = user_evidence_competency::get_relation($userevidence->get_id(), $competencyid); - if (!$relation->get_id()) { + $relation = user_evidence_competency::get_relation($userevidence->get('id'), $competencyid); + if (!$relation->get('id')) { return true; } $success = $relation->delete(); if ($success) { self::add_evidence( - $userevidence->get_userid(), + $userevidence->get('userid'), $competencyid, $userevidence->get_context(), evidence::ACTION_LOG, 'evidence_evidenceofpriorlearningunlinked', 'core_competency', - $userevidence->get_name(), + $userevidence->get('name'), false, null, null, @@ -3938,7 +3938,7 @@ class api { public static function request_review_of_user_evidence_linked_competencies($id) { $userevidence = new user_evidence($id); $context = $userevidence->get_context(); - $userid = $userevidence->get_userid(); + $userid = $userevidence->get('userid'); if (!$userevidence->can_manage()) { throw new required_capability_exception($context, 'moodle/competency:userevidencemanage', 'nopermissions', ''); @@ -3946,8 +3946,8 @@ class api { $usercompetencies = user_evidence_competency::get_user_competencies_by_userevidenceid($id); foreach ($usercompetencies as $usercompetency) { - if ($usercompetency->get_status() == user_competency::STATUS_IDLE) { - static::user_competency_request_review($userid, $usercompetency->get_competencyid()); + if ($usercompetency->get('status') == user_competency::STATUS_IDLE) { + static::user_competency_request_review($userid, $usercompetency->get('competencyid')); } } @@ -3967,15 +3967,15 @@ class api { protected static function duplicate_competency_tree($frameworkid, $tree, $oldparent = 0, $newparent = 0) { $matchids = array(); foreach ($tree as $node) { - if ($node->competency->get_parentid() == $oldparent) { - $parentid = $node->competency->get_id(); + if ($node->competency->get('parentid') == $oldparent) { + $parentid = $node->competency->get('id'); // Create the competency. $competency = new competency(0, $node->competency->to_record()); - $competency->set_competencyframeworkid($frameworkid); - $competency->set_parentid($newparent); - $competency->set_path(''); - $competency->set_id(0); + $competency->set('competencyframeworkid', $frameworkid); + $competency->set('parentid', $newparent); + $competency->set('path', ''); + $competency->set('id', 0); $competency->reset_rule(); $competency->create(); @@ -3987,7 +3987,7 @@ class api { if (!empty($node->children)) { // Duplicate children competency. - $childrenids = self::duplicate_competency_tree($frameworkid, $node->children, $parentid, $competency->get_id()); + $childrenids = self::duplicate_competency_tree($frameworkid, $node->children, $parentid, $competency->get('id')); // Array_merge does not keep keys when merging so we use the + operator. $matchids = $matchids + $childrenids; } @@ -4005,19 +4005,19 @@ class api { protected static function migrate_competency_tree_rules($tree, $matchids) { foreach ($tree as $node) { - $oldcompid = $node->competency->get_id(); - if ($node->competency->get_ruletype() && array_key_exists($oldcompid, $matchids)) { + $oldcompid = $node->competency->get('id'); + if ($node->competency->get('ruletype') && array_key_exists($oldcompid, $matchids)) { try { // Get the new competency. $competency = $matchids[$oldcompid]; - $class = $node->competency->get_ruletype(); - $newruleconfig = $class::migrate_config($node->competency->get_ruleconfig(), $matchids); - $competency->set_ruleconfig($newruleconfig); - $competency->set_ruletype($class); - $competency->set_ruleoutcome($node->competency->get_ruleoutcome()); + $class = $node->competency->get('ruletype'); + $newruleconfig = $class::migrate_config($node->competency->get('ruleconfig'), $matchids); + $competency->set('ruleconfig', $newruleconfig); + $competency->set('ruletype', $class); + $competency->set('ruleoutcome', $node->competency->get('ruleoutcome')); $competency->update(); } catch (\Exception $e) { - debugging('Could not migrate competency rule from: ' . $oldcompid . ' to: ' . $competency->get_id() . '.' . + debugging('Could not migrate competency rule from: ' . $oldcompid . ' to: ' . $competency->get('id') . '.' . ' Exception: ' . $e->getMessage(), DEBUG_DEVELOPER); $competency->reset_rule(); } @@ -4038,23 +4038,23 @@ class api { protected static function archive_user_competencies_in_plan($plan) { // Check if the plan was already completed. - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { throw new coding_exception('The plan is already completed.'); } $competencies = $plan->get_competencies(); - $usercompetencies = user_competency::get_multiple($plan->get_userid(), $competencies); + $usercompetencies = user_competency::get_multiple($plan->get('userid'), $competencies); $i = 0; foreach ($competencies as $competency) { $found = false; foreach ($usercompetencies as $uckey => $uc) { - if ($uc->get_competencyid() == $competency->get_id()) { + if ($uc->get('competencyid') == $competency->get('id')) { $found = true; $ucprecord = $uc->to_record(); - $ucprecord->planid = $plan->get_id(); + $ucprecord->planid = $plan->get('id'); $ucprecord->sortorder = $i; unset($ucprecord->id); unset($ucprecord->status); @@ -4070,9 +4070,9 @@ class api { // If the user competency doesn't exist, we create a new relation in user_competency_plan. if (!$found) { - $usercompetencyplan = user_competency_plan::create_relation($plan->get_userid(), $competency->get_id(), - $plan->get_id()); - $usercompetencyplan->set_sortorder($i); + $usercompetencyplan = user_competency_plan::create_relation($plan->get('userid'), $competency->get('id'), + $plan->get('id')); + $usercompetencyplan->set('sortorder', $i); $usercompetencyplan->create(); } $i++; @@ -4087,7 +4087,7 @@ class api { */ protected static function remove_archived_user_competencies_in_plan($plan) { $competencies = $plan->get_competencies(); - $usercompetenciesplan = user_competency_plan::get_multiple($plan->get_userid(), $plan->get_id(), $competencies); + $usercompetenciesplan = user_competency_plan::get_multiple($plan->get('userid'), $plan->get('id'), $competencies); foreach ($usercompetenciesplan as $ucpkey => $ucp) { $ucp->delete(); @@ -4124,16 +4124,16 @@ class api { $plancompleted = false; if ($planid != 0) { $plan = new plan($planid); - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { $plancompleted = true; } } $select = 'usercompetencyid = :usercompetencyid'; - $params = array('usercompetencyid' => $usercompetency->get_id()); + $params = array('usercompetencyid' => $usercompetency->get('id')); if ($plancompleted) { $select .= ' AND timecreated <= :timecompleted'; - $params['timecompleted'] = $plan->get_timemodified(); + $params['timecompleted'] = $plan->get('timemodified'); } $orderby = $sort . ' ' . $order; @@ -4170,7 +4170,7 @@ class api { } $context = context_course::instance($courseid); - return evidence::get_records_for_usercompetency($usercompetency->get_id(), $context, $sort, $order, $skip, $limit); + return evidence::get_records_for_usercompetency($usercompetency->get('id'), $context, $sort, $order, $skip, $limit); } /** @@ -4208,7 +4208,7 @@ class api { $competency = null; if (is_object($competencyid)) { $competency = $competencyid; - $competencyid = $competency->get_id(); + $competencyid = $competency->get('id'); } $contextid = $contextorid; $context = $contextorid; @@ -4271,20 +4271,20 @@ class api { $usercompetencycourse->create(); } // Only update the grade and proficiency if there is not already a grade. - if ($usercompetencycourse->get_grade() === null) { + if ($usercompetencycourse->get('grade') === null) { // Set grade. - $usercompetencycourse->set_grade($grade); + $usercompetencycourse->set('grade', $grade); // Set proficiency. - $usercompetencycourse->set_proficiency($proficiency); + $usercompetencycourse->set('proficiency', $proficiency); } // Check the course settings to see if we should push to user plans. $coursesettings = course_competency_settings::get_by_courseid($courseid); - $setucgrade = $coursesettings->get_pushratingstouserplans(); + $setucgrade = $coursesettings->get('pushratingstouserplans'); if ($setucgrade) { // Only push to user plans if there is not already a grade. - if ($usercompetency->get_grade() !== null) { + if ($usercompetency->get('grade') !== null) { $setucgrade = false; } else { $ucgrade = $grade; @@ -4295,7 +4295,7 @@ class api { // When completing the competency we fetch the default grade from the competency. But we only mark // the user competency when a grade has not been set yet. Complete is an action to use with automated systems. - if ($usercompetency->get_grade() === null) { + if ($usercompetency->get('grade') === null) { $setucgrade = true; $ucgrade = $grade; $ucproficiency = $proficiency; @@ -4339,12 +4339,12 @@ class api { $proficiency = $competency->get_proficiency_of_grade($grade); } // Set grade. - $usercompetencycourse->set_grade($grade); + $usercompetencycourse->set('grade', $grade); // Set proficiency. - $usercompetencycourse->set_proficiency($proficiency); + $usercompetencycourse->set('proficiency', $proficiency); $coursesettings = course_competency_settings::get_by_courseid($courseid); - if (!$coursesettings->get_pushratingstouserplans()) { + if (!$coursesettings->get('pushratingstouserplans')) { $setucgrade = false; } } @@ -4365,23 +4365,23 @@ class api { } // Should we recommend? - if ($recommend && $usercompetency->get_status() == user_competency::STATUS_IDLE) { - $usercompetency->set_status(user_competency::STATUS_WAITING_FOR_REVIEW); + if ($recommend && $usercompetency->get('status') == user_competency::STATUS_IDLE) { + $usercompetency->set('status', user_competency::STATUS_WAITING_FOR_REVIEW); } // Setting the grade and proficiency for the user competency. $wascompleted = false; if ($setucgrade == true) { - if (!$usercompetency->get_proficiency() && $ucproficiency) { + if (!$usercompetency->get('proficiency') && $ucproficiency) { $wascompleted = true; } - $usercompetency->set_grade($ucgrade); - $usercompetency->set_proficiency($ucproficiency); + $usercompetency->set('grade', $ucgrade); + $usercompetency->set('proficiency', $ucproficiency); } // Prepare the evidence. $record = new stdClass(); - $record->usercompetencyid = $usercompetency->get_id(); + $record->usercompetencyid = $usercompetency->get('id'); $record->contextid = $contextid; $record->action = $action; $record->descidentifier = $descidentifier; @@ -4390,8 +4390,8 @@ class api { $record->actionuserid = $actionuserid; $record->note = $note; $evidence = new evidence(0, $record); - $evidence->set_desca($desca); - $evidence->set_url($url); + $evidence->set('desca', $desca); + $evidence->set('url', $url); // Validate both models, we should not operate on one if the other will not save. if (!$usercompetency->is_valid()) { @@ -4433,7 +4433,7 @@ class api { static::require_enabled(); $evidence = new evidence($evidenceid); - $uc = new user_competency($evidence->get_usercompetencyid()); + $uc = new user_competency($evidence->get('usercompetencyid')); if (!$uc->can_read()) { throw new required_capability_exception($uc->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', ''); @@ -4454,8 +4454,8 @@ class api { $evidence = new evidence($evidenceorid); } - $uc = new user_competency($evidence->get_usercompetencyid()); - if (!evidence::can_delete_user($uc->get_userid())) { + $uc = new user_competency($evidence->get('usercompetencyid')); + if (!evidence::can_delete_user($uc->get('userid'))) { throw new required_capability_exception($uc->get_context(), 'moodle/competency:evidencedelete', 'nopermissions', ''); } @@ -4480,13 +4480,13 @@ class api { competency $competency = null) { // Perform some basic checks. - if (!$usercompetency->get_proficiency()) { + if (!$usercompetency->get('proficiency')) { throw new coding_exception('The user competency passed is not completed.'); } if ($competency === null) { $competency = $usercompetency->get_competency(); } - if ($competency->get_id() != $usercompetency->get_competencyid()) { + if ($competency->get('id') != $usercompetency->get('competencyid')) { throw new coding_exception('Mismatch between user competency and competency.'); } @@ -4497,7 +4497,7 @@ class api { } // The parent should have a rule, and a meaningful outcome. - $ruleoutcome = $parent->get_ruleoutcome(); + $ruleoutcome = $parent->get('ruleoutcome'); if ($ruleoutcome == competency::OUTCOME_NONE) { return; } @@ -4507,10 +4507,10 @@ class api { } // Fetch or create the user competency for the parent. - $userid = $usercompetency->get_userid(); - $parentuc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $parent->get_id())); + $userid = $usercompetency->get('userid'); + $parentuc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $parent->get('id'))); if (!$parentuc) { - $parentuc = user_competency::create_relation($userid, $parent->get_id()); + $parentuc = user_competency::create_relation($userid, $parent->get('id')); $parentuc->create(); } @@ -4575,7 +4575,7 @@ class api { $url = $fastmodinfo->url; foreach ($coursemodulecompetencies as $coursemodulecompetency) { - $outcome = $coursemodulecompetency->get_ruleoutcome(); + $outcome = $coursemodulecompetency->get('ruleoutcome'); $action = null; $recommend = false; $strdesc = 'evidence_coursemodulecompleted'; @@ -4596,7 +4596,7 @@ class api { static::add_evidence( $event->relateduserid, - $coursemodulecompetency->get_competencyid(), + $coursemodulecompetency->get('competencyid'), $event->contextid, $action, $strdesc, @@ -4635,7 +4635,7 @@ class api { foreach ($coursecompetencies as $coursecompetency) { - $outcome = $coursecompetency->get_ruleoutcome(); + $outcome = $coursecompetency->get('ruleoutcome'); $action = null; $recommend = false; $strdesc = 'evidence_coursecompleted'; @@ -4656,7 +4656,7 @@ class api { static::add_evidence( $event->relateduserid, - $coursecompetency->get_competencyid(), + $coursecompetency->get('competencyid'), $event->contextid, $action, $strdesc, @@ -4737,7 +4737,7 @@ class api { $uc = static::get_user_competency($userid, $competencyid); $context = $uc->get_context(); - if (!user_competency::can_grade_user($uc->get_userid())) { + if (!user_competency::can_grade_user($uc->get('userid'))) { throw new required_capability_exception($context, 'moodle/competency:competencygrade', 'nopermissions', ''); } @@ -4752,7 +4752,7 @@ class api { $action = evidence::ACTION_OVERRIDE; $desckey = 'evidence_manualoverride'; - $result = self::add_evidence($uc->get_userid(), + $result = self::add_evidence($uc->get('userid'), $competency, $context->id, $action, @@ -4791,7 +4791,7 @@ class api { } $context = $plan->get_context(); - if (!user_competency::can_grade_user($plan->get_userid())) { + if (!user_competency::can_grade_user($plan->get('userid'))) { throw new required_capability_exception($context, 'moodle/competency:competencygrade', 'nopermissions', ''); } @@ -4806,21 +4806,21 @@ class api { $action = evidence::ACTION_OVERRIDE; $desckey = 'evidence_manualoverrideinplan'; - $result = self::add_evidence($plan->get_userid(), + $result = self::add_evidence($plan->get('userid'), $competency, $context->id, $action, $desckey, 'core_competency', - $plan->get_name(), + $plan->get('name'), false, null, $grade, $USER->id, $note); if ($result) { - $uc = static::get_user_competency($plan->get_userid(), $competency->get_id()); - $event = \core\event\competency_user_competency_rated_in_plan::create_from_user_competency($uc, $plan->get_id()); + $uc = static::get_user_competency($plan->get('userid'), $competency->get('id')); + $event = \core\event\competency_user_competency_rated_in_plan::create_from_user_competency($uc, $plan->get('id')); $event->trigger(); } return $result; @@ -4888,7 +4888,7 @@ class api { $USER->id, $note); if ($result) { - $all = user_competency_course::get_multiple($userid, $course->id, array($competency->get_id())); + $all = user_competency_course::get_multiple($userid, $course->id, array($competency->get('id'))); $uc = reset($all); $event = \core\event\competency_user_competency_rated_in_course::create_from_user_competency_course($uc); $event->trigger(); @@ -4918,7 +4918,7 @@ class api { 'nopermissions', ''); } - return plan::count_records_for_template($template->get_id(), $status); + return plan::count_records_for_template($template->get('id'), $status); } /** @@ -4943,7 +4943,7 @@ class api { 'nopermissions', ''); } - return user_competency_plan::count_records_for_template($template->get_id(), $proficiency); + return user_competency_plan::count_records_for_template($template->get('id'), $proficiency); } /** @@ -4969,7 +4969,7 @@ class api { 'nopermissions', ''); } - return plan::get_records_for_template($template->get_id(), $status, $skip, $limit); + return plan::get_records_for_template($template->get('id'), $status, $skip, $limit); } /** @@ -5016,7 +5016,7 @@ class api { 'nopermissions', ''); } - return user_competency_plan::get_least_proficient_competencies_for_template($template->get_id(), $skip, $limit); + return user_competency_plan::get_least_proficient_competencies_for_template($template->get('id'), $skip, $limit); } /** @@ -5094,7 +5094,7 @@ class api { // Now update or insert. if ($exists) { $settings = $exists; - $settings->set_pushratingstouserplans($pushratingstouserplans); + $settings->set('pushratingstouserplans', $pushratingstouserplans); return $settings->update(); } else { $data = (object) array('courseid' => $courseid, 'pushratingstouserplans' => $pushratingstouserplans); diff --git a/competency/classes/competency.php b/competency/classes/competency.php index 8af4927ff28..675e7220687 100644 --- a/competency/classes/competency.php +++ b/competency/classes/competency.php @@ -129,11 +129,11 @@ class competency extends persistent { $this->newparent = null; // During update. - if ($this->get_id()) { - $this->beforeupdate = new competency($this->get_id()); + if ($this->get('id')) { + $this->beforeupdate = new competency($this->get('id')); // The parent ID has changed. - if ($this->beforeupdate->get_parentid() != $this->get_parentid()) { + if ($this->beforeupdate->get('parentid') != $this->get('parentid')) { $this->newparent = $this->get_parent(); // Update path and sortorder. @@ -166,8 +166,8 @@ class competency extends persistent { } // The parent ID has changed, we need to fix all the paths of the children. - if ($this->beforeupdate->get_parentid() != $this->get_parentid()) { - $beforepath = $this->beforeupdate->get_path() . $this->get_id() . '/'; + if ($this->beforeupdate->get('parentid') != $this->get('parentid')) { + $beforepath = $this->beforeupdate->get('path') . $this->get('id') . '/'; $like = $DB->sql_like('path', '?'); $likesearch = $DB->sql_like_escape($beforepath) . '%'; @@ -176,7 +176,7 @@ class competency extends persistent { $sql = "UPDATE $table SET path = REPLACE(path, ?, ?) WHERE " . $like; $DB->execute($sql, array( $beforepath, - $this->get_path() . $this->get_id() . '/', + $this->get('path') . $this->get('id') . '/', $likesearch )); @@ -184,9 +184,9 @@ class competency extends persistent { $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 " . " WHERE competencyframeworkid = ? AND parentid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_competencyframeworkid(), - $this->beforeupdate->get_parentid(), - $this->beforeupdate->get_sortorder() + $DB->execute($sql, array($this->get('competencyframeworkid'), + $this->beforeupdate->get('parentid'), + $this->beforeupdate->get('sortorder') )); } @@ -209,7 +209,7 @@ class competency extends persistent { // Resolving sortorder holes left after delete. $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 WHERE competencyframeworkid = ? AND parentid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_competencyframeworkid(), $this->get_parentid(), $this->get_sortorder())); + $DB->execute($sql, array($this->get('competencyframeworkid'), $this->get('parentid'), $this->get('sortorder'))); } /** @@ -221,10 +221,10 @@ class competency extends persistent { * @return array(int grade, bool proficient) */ public function get_default_grade() { - $scaleid = $this->get_scaleid(); - $scaleconfig = $this->get_scaleconfiguration(); + $scaleid = $this->get('scaleid'); + $scaleconfig = $this->get('scaleconfiguration'); if ($scaleid === null) { - $scaleconfig = $this->get_framework()->get_scaleconfiguration(); + $scaleconfig = $this->get_framework()->get('scaleconfiguration'); } return competency_framework::get_default_grade_from_scale_configuration($scaleconfig); } @@ -235,7 +235,7 @@ class competency extends persistent { * @return competency_framework */ public function get_framework() { - return new competency_framework($this->get_competencyframeworkid()); + return new competency_framework($this->get('competencyframeworkid')); } /** @@ -244,7 +244,7 @@ class competency extends persistent { * @return int */ public function get_level() { - $path = $this->get_path(); + $path = $this->get('path'); $path = trim($path, '/'); return substr_count($path, '/') + 1; } @@ -255,7 +255,7 @@ class competency extends persistent { * @return null|competency */ public function get_parent() { - $parentid = $this->get_parentid(); + $parentid = $this->get('parentid'); if (!$parentid) { return null; } @@ -269,10 +269,10 @@ class competency extends persistent { * @return array(int grade, bool proficient) */ public function get_proficiency_of_grade($grade) { - $scaleid = $this->get_scaleid(); - $scaleconfig = $this->get_scaleconfiguration(); + $scaleid = $this->get('scaleid'); + $scaleconfig = $this->get('scaleconfiguration'); if ($scaleid === null) { - $scaleconfig = $this->get_framework()->get_scaleconfiguration(); + $scaleconfig = $this->get_framework()->get('scaleconfiguration'); } return competency_framework::get_proficiency_of_grade_from_scale_configuration($scaleconfig, $grade); } @@ -283,7 +283,7 @@ class competency extends persistent { * @return competency[] */ public function get_related_competencies() { - return related_competency::get_related_competencies($this->get_id()); + return related_competency::get_related_competencies($this->get('id')); } /** @@ -292,7 +292,7 @@ class competency extends persistent { * @return null|competency_rule */ public function get_rule_object() { - $rule = $this->get_ruletype(); + $rule = $this->get('ruletype'); if (!$rule || !is_subclass_of($rule, 'core_competency\\competency_rule')) { // Double check that the rule is extending the right class to avoid bad surprises. @@ -308,7 +308,7 @@ class competency extends persistent { * @return \grade_scale */ public function get_scale() { - $scaleid = $this->get_scaleid(); + $scaleid = $this->get('scaleid'); if ($scaleid === null) { return $this->get_framework()->get_scale(); } @@ -325,8 +325,8 @@ class competency extends persistent { * @return boolean */ public function has_user_competencies() { - return user_competency::has_records_for_competency($this->get_id()) || - user_competency_plan::has_records_for_competency($this->get_id()); + return user_competency::has_records_for_competency($this->get('id')) || + user_competency_plan::has_records_for_competency($this->get('id')); } /** @@ -339,7 +339,7 @@ class competency extends persistent { global $DB; list($insql, $params) = $DB->get_in_or_equal($ids, SQL_PARAMS_NAMED); - $params['parentid'] = $this->get_id(); + $params['parentid'] = $this->get('id'); return $DB->count_records_select(self::TABLE, "id $insql AND parentid = :parentid", $params) == count($ids); } @@ -350,9 +350,9 @@ class competency extends persistent { * @return void */ public function reset_rule() { - $this->set_ruleoutcome(static::OUTCOME_NONE); - $this->set_ruletype(null); - $this->set_ruleconfig(null); + $this->raw_set('ruleoutcome', static::OUTCOME_NONE); + $this->raw_set('ruletype', null); + $this->raw_set('ruleconfig', null); } /** @@ -363,11 +363,11 @@ class competency extends persistent { */ protected function set_new_path(competency $parent = null) { $path = '/0/'; - if ($this->get_parentid()) { + if ($this->get('parentid')) { $parent = $parent !== null ? $parent : $this->get_parent(); - $path = $parent->get_path() . $this->get_parentid() . '/'; + $path = $parent->get('path') . $this->get('parentid') . '/'; } - $this->set('path', $path); + $this->raw_set('path', $path); } /** @@ -376,8 +376,8 @@ class competency extends persistent { * @return void */ protected function set_new_sortorder() { - $search = array('parentid' => $this->get_parentid(), 'competencyframeworkid' => $this->get_competencyframeworkid()); - $this->set('sortorder', $this->count_records($search)); + $search = array('parentid' => $this->get('parentid'), 'competencyframeworkid' => $this->get('competencyframeworkid')); + $this->raw_set('sortorder', $this->count_records($search)); } /** @@ -437,7 +437,7 @@ class competency extends persistent { // Convert to instances of this class. foreach ($records as $record) { $newrecord = new static(0, $record); - $instances[$newrecord->get_id()] = $newrecord; + $instances[$newrecord->get('id')] = $newrecord; } return $instances; } @@ -451,10 +451,10 @@ class competency extends persistent { protected function validate_competencyframeworkid($value) { // During update. - if ($this->get_id()) { + if ($this->get('id')) { // Ensure that we are not trying to move the competency across frameworks. - if ($this->beforeupdate->get_competencyframeworkid() != $value) { + if ($this->beforeupdate->get('competencyframeworkid') != $value) { return new lang_string('invaliddata', 'error'); } @@ -480,9 +480,9 @@ class competency extends persistent { global $DB; $sql = 'idnumber = :idnumber AND competencyframeworkid = :competencyframeworkid AND id <> :id'; $params = array( - 'id' => $this->get_id(), + 'id' => $this->get('id'), 'idnumber' => $value, - 'competencyframeworkid' => $this->get_competencyframeworkid() + 'competencyframeworkid' => $this->get('competencyframeworkid') ); if ($DB->record_exists_select(self::TABLE, $sql, $params)) { return new lang_string('idnumbertaken', 'error'); @@ -499,7 +499,7 @@ class competency extends persistent { protected function validate_path($value) { // The last item should be the parent ID. - $id = $this->get_parentid(); + $id = $this->get('parentid'); if (substr($value, -(strlen($id) + 2)) != '/' . $id . '/') { return new lang_string('invaliddata', 'error'); @@ -525,13 +525,13 @@ class competency extends persistent { } // During update. - if ($this->get_id()) { + if ($this->get('id')) { // If there is a new parent. - if ($this->beforeupdate->get_parentid() != $value && $this->newparent) { + if ($this->beforeupdate->get('parentid') != $value && $this->newparent) { // Check that the new parent belongs to the same framework. - if ($this->newparent->get_competencyframeworkid() != $this->get_competencyframeworkid()) { + if ($this->newparent->get('competencyframeworkid') != $this->get('competencyframeworkid')) { return new lang_string('invaliddata', 'error'); } } @@ -608,10 +608,10 @@ class competency extends persistent { } // During update. - if ($this->get_id()) { + if ($this->get('id')) { // Validate that we can only change the scale when it is not used yet. - if ($this->beforeupdate->get_scaleid() != $value) { + if ($this->beforeupdate->get('scaleid') != $value) { if ($this->has_user_competencies()) { return new lang_string('errorscalealreadyused', 'core_competency'); } @@ -746,10 +746,10 @@ class competency extends persistent { protected static function build_tree($all, $parentid) { $tree = array(); foreach ($all as $one) { - if ($one->get_parentid() == $parentid) { + if ($one->get('parentid') == $parentid) { $node = new stdClass(); $node->competency = $one; - $node->children = self::build_tree($all, $one->get_id()); + $node->children = self::build_tree($all, $one->get('id')); $tree[] = $node; } } @@ -819,7 +819,7 @@ class competency extends persistent { public static function get_descendants_ids($competency) { global $DB; - $path = $DB->sql_like_escape($competency->get_path() . $competency->get_id() . '/') . '%'; + $path = $DB->sql_like_escape($competency->get('path') . $competency->get('id') . '/') . '%'; $like = $DB->sql_like('path', ':likepath'); return $DB->get_fieldset_select(self::TABLE, 'id', $like, array('likepath' => $path)); } @@ -859,7 +859,7 @@ class competency extends persistent { public function get_ancestors() { global $DB; $ancestors = array(); - $ancestorsids = explode('/', trim($this->get_path(), '/')); + $ancestorsids = explode('/', trim($this->get('path'), '/')); // Drop the root item from the array /0/. array_shift($ancestorsids); if (!empty($ancestorsids)) { diff --git a/competency/classes/competency_framework.php b/competency/classes/competency_framework.php index b1f323aab7f..52e644bd92e 100644 --- a/competency/classes/competency_framework.php +++ b/competency/classes/competency_framework.php @@ -73,7 +73,7 @@ class competency_framework extends persistent { * @return context The context */ public function get_context() { - return context::instance_by_id($this->get_contextid()); + return context::instance_by_id($this->get('contextid')); } /** @@ -127,8 +127,8 @@ class competency_framework extends persistent { $this->beforeupdate = null; // During update. - if ($this->get_id()) { - $this->beforeupdate = new competency_framework($this->get_id()); + if ($this->get('id')) { + $this->beforeupdate = new competency_framework($this->get('id')); } } @@ -140,7 +140,7 @@ class competency_framework extends persistent { * @return int */ public function get_depth() { - return competency::get_framework_depth($this->get_id()); + return competency::get_framework_depth($this->get('id')); } /** @@ -149,7 +149,7 @@ class competency_framework extends persistent { * @return \grade_scale */ public function get_scale() { - $scale = \grade_scale::fetch(array('id' => $this->get_scaleid())); + $scale = \grade_scale::fetch(array('id' => $this->get('scaleid'))); $scale->load_items(); return $scale; } @@ -179,7 +179,7 @@ class competency_framework extends persistent { * @return array Contains the list of taxonomy constants indexed by level. */ public function get_taxonomies() { - $taxonomies = explode(',', $this->get('taxonomies')); + $taxonomies = explode(',', $this->raw_get('taxonomies')); // Indexing first level at 1. array_unshift($taxonomies, null); @@ -203,8 +203,8 @@ class competency_framework extends persistent { * @return boolean */ public function has_user_competencies() { - return user_competency::has_records_for_framework($this->get_id()) || - user_competency_plan::has_records_for_framework($this->get_id()); + return user_competency::has_records_for_framework($this->get('id')) || + user_competency_plan::has_records_for_framework($this->get('id')); } /** @@ -216,7 +216,7 @@ class competency_framework extends persistent { if (is_array($taxonomies)) { $taxonomies = implode(',', $taxonomies); } - $this->set('taxonomies', $taxonomies); + $this->raw_set('taxonomies', $taxonomies); } /** @@ -236,11 +236,11 @@ class competency_framework extends persistent { } // During update. - if ($this->get_id()) { + if ($this->get('id')) { // The context must never change. - $oldcontextid = $DB->get_field(self::TABLE, 'contextid', array('id' => $this->get_id()), MUST_EXIST); - if ($this->get_contextid() != $oldcontextid) { + $oldcontextid = $DB->get_field(self::TABLE, 'contextid', array('id' => $this->get('id')), MUST_EXIST); + if ($this->get('contextid') != $oldcontextid) { return new lang_string('invalidcontext', 'error'); } } @@ -284,10 +284,10 @@ class competency_framework extends persistent { } // During update. - if ($this->get_id()) { + if ($this->get('id')) { // Validate that we can only change the scale when it is not used yet. - if ($this->beforeupdate->get_scaleid() != $value) { + if ($this->beforeupdate->get('scaleid') != $value) { if ($this->beforeupdate->has_user_competencies()) { return new lang_string('errorscalealreadyused', 'core_competency'); } diff --git a/competency/classes/competency_rule.php b/competency/classes/competency_rule.php index 49f4f40ccd7..6ca6cc9fdb5 100644 --- a/competency/classes/competency_rule.php +++ b/competency/classes/competency_rule.php @@ -48,7 +48,7 @@ abstract class competency_rule { * @param competency $competency The competency. */ public function __construct(competency $competency) { - $class = $competency->get_ruletype(); + $class = $competency->get('ruletype'); if (!$class || !($this instanceof $class)) { throw new coding_exception('This competency does not use this rule.'); } @@ -62,7 +62,7 @@ abstract class competency_rule { * @return mixed */ protected function get_config() { - return $this->competency->get_ruleconfig(); + return $this->competency->get('ruleconfig'); } /** diff --git a/competency/classes/competency_rule_all.php b/competency/classes/competency_rule_all.php index 69f88582fca..2874afc90dc 100644 --- a/competency/classes/competency_rule_all.php +++ b/competency/classes/competency_rule_all.php @@ -48,7 +48,7 @@ class competency_rule_all extends competency_rule { global $DB; // TODO Improve performance here, perhaps the caller could already provide records. - $children = competency::get_records(array('parentid' => $this->competency->get_id())); + $children = competency::get_records(array('parentid' => $this->competency->get('id'))); if (empty($children)) { // Leaves are not compatible with this rule. @@ -57,14 +57,14 @@ class competency_rule_all extends competency_rule { $ids = array(); foreach ($children as $child) { - $ids[] = $child->get_id(); + $ids[] = $child->get('id'); } list($insql, $params) = $DB->get_in_or_equal($ids, SQL_PARAMS_NAMED); $sql = "userid = :userid AND proficiency = :proficiency AND competencyid $insql"; - $params['userid'] = $usercompetency->get_userid(); + $params['userid'] = $usercompetency->get('userid'); $params['proficiency'] = 1; // Is the user is marked as proficient in all children? diff --git a/competency/classes/competency_rule_points.php b/competency/classes/competency_rule_points.php index 7d727bdff56..6b91b796919 100644 --- a/competency/classes/competency_rule_points.php +++ b/competency/classes/competency_rule_points.php @@ -77,7 +77,7 @@ class competency_rule_points extends competency_rule { $sql = "userid = :userid AND proficiency = :proficiency AND competencyid $insql"; - $params['userid'] = $usercompetency->get_userid(); + $params['userid'] = $usercompetency->get('userid'); $params['proficiency'] = 1; $ucs = user_competency::get_records_select($sql, $params, '', 'competencyid'); @@ -133,7 +133,7 @@ class competency_rule_points extends competency_rule { foreach ($config->competencies as $competency) { // Cannot include self. - if ($competency->id == $this->competency->get_id()) { + if ($competency->id == $this->competency->get('id')) { return false; } @@ -204,7 +204,7 @@ class competency_rule_points extends competency_rule { foreach ($ruleconfig['competencies'] as $key => $rulecomp) { $rulecmpid = $rulecomp['id']; if (array_key_exists($rulecmpid, $mappings)) { - $ruleconfig['competencies'][$key]['id'] = $mappings[$rulecmpid]->get_id(); + $ruleconfig['competencies'][$key]['id'] = $mappings[$rulecmpid]->get('id'); } else { throw new coding_exception("The competency id is not found in the matchids."); } diff --git a/competency/classes/course_competency.php b/competency/classes/course_competency.php index 6ec21af8990..b929b676f33 100644 --- a/competency/classes/course_competency.php +++ b/competency/classes/course_competency.php @@ -81,8 +81,8 @@ class course_competency extends persistent { * @return void */ protected function before_validate() { - if (($this->get_id() && $this->get_sortorder() === null) || !$this->get_id()) { - $this->set('sortorder', $this->count_records(array('courseid' => $this->get_courseid()))); + if (($this->get('id') && $this->get('sortorder') === null) || !$this->get('id')) { + $this->set('sortorder', $this->count_records(array('courseid' => $this->get('courseid')))); } } @@ -294,7 +294,7 @@ class course_competency extends persistent { $instances = array(); foreach ($results as $result) { $comp = new competency(0, $result); - $instances[$comp->get_id()] = $comp; + $instances[$comp->get('id')] = $comp; } $results->close(); @@ -340,7 +340,7 @@ class course_competency extends persistent { $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 WHERE courseid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_courseid(), $this->get_sortorder())); + $DB->execute($sql, array($this->get('courseid'), $this->get('sortorder'))); } /** diff --git a/competency/classes/course_competency_settings.php b/competency/classes/course_competency_settings.php index 1e12a364cbe..44dcfc952ff 100644 --- a/competency/classes/course_competency_settings.php +++ b/competency/classes/course_competency_settings.php @@ -113,7 +113,7 @@ class course_competency_settings extends persistent { * @return bool */ public function can_manage() { - return static::can_manage_course($this->get_courseid()); + return static::can_manage_course($this->get('courseid')); } /** @@ -136,6 +136,6 @@ class course_competency_settings extends persistent { * @return context The context */ public function get_context() { - return context_course::instance($this->get_courseid()); + return context_course::instance($this->get('courseid')); } } diff --git a/competency/classes/course_module_competency.php b/competency/classes/course_module_competency.php index 2065ba2219e..405b495f18c 100644 --- a/competency/classes/course_module_competency.php +++ b/competency/classes/course_module_competency.php @@ -80,8 +80,8 @@ class course_module_competency extends persistent { * @return void */ protected function before_validate() { - if (($this->get_id() && $this->get_sortorder() === null) || !$this->get_id()) { - $this->set('sortorder', $this->count_records(array('cmid' => $this->get_cmid()))); + if (($this->get('id') && $this->get('sortorder') === null) || !$this->get('id')) { + $this->set('sortorder', $this->count_records(array('cmid' => $this->get('cmid')))); } } @@ -222,7 +222,7 @@ class course_module_competency extends persistent { $instances = array(); foreach ($results as $result) { $comp = new competency(0, $result); - $instances[$comp->get_id()] = $comp; + $instances[$comp->get('id')] = $comp; } $results->close(); @@ -268,7 +268,7 @@ class course_module_competency extends persistent { $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 WHERE cmid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_cmid(), $this->get_sortorder())); + $DB->execute($sql, array($this->get('cmid'), $this->get('sortorder'))); } /** diff --git a/competency/classes/evidence.php b/competency/classes/evidence.php index 03d63a4d96d..70b5f2b4abc 100644 --- a/competency/classes/evidence.php +++ b/competency/classes/evidence.php @@ -107,7 +107,7 @@ class evidence extends persistent { * @return competency */ public function get_competency() { - return user_competency::get_competency_by_usercompetencyid($this->get_usercompetencyid()); + return user_competency::get_competency_by_usercompetencyid($this->get('usercompetencyid')); } /** @@ -125,7 +125,7 @@ class evidence extends persistent { * @return mixed */ public function get_desca() { - $value = $this->get('desca'); + $value = $this->raw_get('desca'); if ($value !== null) { $value = json_decode($value); } @@ -154,7 +154,7 @@ class evidence extends persistent { } $value = json_encode($value); } - $this->set('desca', $value); + $this->raw_set('desca', $value); } /** @@ -166,7 +166,7 @@ class evidence extends persistent { if ($url instanceof \moodle_url) { $url = $url->out(false); } - $this->set('url', $url); + $this->raw_set('url', $url); } /** @@ -229,7 +229,7 @@ class evidence extends persistent { * @return true|lang_string */ protected function validate_descidentifier($value) { - if (!$this->get_id() && !get_string_manager()->string_exists($value, $this->get('desccomponent'))) { + if (!$this->get('id') && !get_string_manager()->string_exists($value, $this->get('desccomponent'))) { return new lang_string('invalidevidencedesc', 'core_competency'); } diff --git a/competency/classes/external.php b/competency/classes/external.php index bb6755ee04b..1024e57ff50 100644 --- a/competency/classes/external.php +++ b/competency/classes/external.php @@ -3133,7 +3133,7 @@ class external extends external_api { $result = api::list_plan_competencies($plan); - if ($plan->get_status() == plan::STATUS_COMPLETE) { + if ($plan->get('status') == plan::STATUS_COMPLETE) { $ucproperty = 'usercompetencyplan'; } else { $ucproperty = 'usercompetency'; @@ -3292,7 +3292,7 @@ class external extends external_api { $userevidence = api::read_user_evidence($params['id']); self::validate_context($userevidence->get_context()); - return api::delete_user_evidence($userevidence->get_id()); + return api::delete_user_evidence($userevidence->get('id')); } /** @@ -3623,7 +3623,7 @@ class external extends external_api { )); $coursecompetency = new course_competency($params['coursecompetencyid']); - self::validate_context(context_course::instance($coursecompetency->get_courseid())); + self::validate_context(context_course::instance($coursecompetency->get('courseid'))); return api::set_course_competency_ruleoutcome($coursecompetency, $params['ruleoutcome']); } @@ -3697,8 +3697,8 @@ class external extends external_api { $output = $PAGE->get_renderer('core'); $evidence = api::grade_competency( - $uc->get_userid(), - $uc->get_competencyid(), + $uc->get('userid'), + $uc->get('competencyid'), $params['grade'], $params['note'] ); @@ -3784,7 +3784,7 @@ class external extends external_api { $output = $PAGE->get_renderer('core'); $evidence = api::grade_competency_in_plan( - $plan->get_id(), + $plan->get('id'), $params['competencyid'], $params['grade'], $params['note'] @@ -4290,7 +4290,7 @@ class external extends external_api { )); $evidence = api::read_evidence($params['id']); - $uc = api::get_user_competency_by_id($evidence->get_usercompetencyid()); + $uc = api::get_user_competency_by_id($evidence->get('usercompetencyid')); self::validate_context($uc->get_context()); return api::delete_evidence($evidence); diff --git a/competency/classes/external/competency_framework_exporter.php b/competency/classes/external/competency_framework_exporter.php index b9d8120e5c1..cdc8c98d280 100644 --- a/competency/classes/external/competency_framework_exporter.php +++ b/competency/classes/external/competency_framework_exporter.php @@ -51,7 +51,7 @@ class competency_framework_exporter extends \core\external\persistent_exporter { * @return Array */ protected function get_other_values(renderer_base $output) { - $filters = array('competencyframeworkid' => $this->persistent->get_id()); + $filters = array('competencyframeworkid' => $this->persistent->get('id')); $context = $this->persistent->get_context(); return array( 'canmanage' => has_capability('moodle/competency:competencymanage', $context), diff --git a/competency/classes/external/evidence_exporter.php b/competency/classes/external/evidence_exporter.php index 3e07e602ca7..9e7d5baad1d 100644 --- a/competency/classes/external/evidence_exporter.php +++ b/competency/classes/external/evidence_exporter.php @@ -78,26 +78,26 @@ class evidence_exporter extends \core\external\persistent_exporter { $other['actionuser'] = $actionuser; } - $other['description'] = $this->persistent->get_description(); + $other['description'] = $this->persistent->get('description'); - $other['userdate'] = userdate($this->persistent->get_timecreated()); + $other['userdate'] = userdate($this->persistent->get('timecreated')); - if ($this->persistent->get_grade() === null) { + if ($this->persistent->get('grade') === null) { $gradename = '-'; } else { - $gradename = $this->related['scale']->scale_items[$this->persistent->get_grade() - 1]; + $gradename = $this->related['scale']->scale_items[$this->persistent->get('grade') - 1]; } $other['gradename'] = $gradename; // Try to guess the user from the user competency. $userid = null; if ($this->related['usercompetency']) { - $userid = $this->related['usercompetency']->get_userid(); + $userid = $this->related['usercompetency']->get('userid'); } else if ($this->related['usercompetencyplan']) { - $userid = $this->related['usercompetencyplan']->get_userid(); + $userid = $this->related['usercompetencyplan']->get('userid'); } else { - $uc = user_competency::get_record(['id' => $this->persistent->get_usercompetencyid()]); - $userid = $uc->get_userid(); + $uc = user_competency::get_record(['id' => $this->persistent->get('usercompetencyid')]); + $userid = $uc->get('userid'); } $other['candelete'] = evidence::can_delete_user($userid); diff --git a/competency/classes/external/performance_helper.php b/competency/classes/external/performance_helper.php index 5630a3ffa79..cfe04c6692a 100644 --- a/competency/classes/external/performance_helper.php +++ b/competency/classes/external/performance_helper.php @@ -60,7 +60,7 @@ class performance_helper { * @return \context */ public function get_context_from_competency(competency $competency) { - $frameworkid = $competency->get_competencyframeworkid(); + $frameworkid = $competency->get('competencyframeworkid'); if (!isset($this->frameworkscontexts[$frameworkid])) { $framework = $this->get_framework_from_competency($competency); $this->frameworkscontexts[$frameworkid] = $framework->get_context(); @@ -75,7 +75,7 @@ class performance_helper { * @return competency_framework */ public function get_framework_from_competency(competency $competency) { - $frameworkid = $competency->get_competencyframeworkid(); + $frameworkid = $competency->get('competencyframeworkid'); if (!isset($this->frameworks[$frameworkid])) { $this->frameworks[$frameworkid] = $competency->get_framework(); } @@ -93,13 +93,13 @@ class performance_helper { * @return \grade_scale */ public function get_scale_from_competency(competency $competency) { - $scaleid = $competency->get_scaleid(); + $scaleid = $competency->get('scaleid'); if ($scaleid !== null && !isset($this->scales[$scaleid])) { $this->scales[$scaleid] = $competency->get_scale(); } else if ($scaleid === null) { $framework = $this->get_framework_from_competency($competency); - $scaleid = $framework->get_scaleid(); + $scaleid = $framework->get('scaleid'); if (!isset($this->scales[$scaleid])) { $this->scales[$scaleid] = $framework->get_scale(); } diff --git a/competency/classes/external/plan_exporter.php b/competency/classes/external/plan_exporter.php index c1efc92784b..1852765ec59 100644 --- a/competency/classes/external/plan_exporter.php +++ b/competency/classes/external/plan_exporter.php @@ -50,7 +50,7 @@ class plan_exporter extends \core\external\persistent_exporter { protected function get_other_values(renderer_base $output) { $classname = static::define_class(); - $status = $this->persistent->get_status(); + $status = $this->persistent->get('status'); $values = new stdClass(); @@ -87,7 +87,7 @@ class plan_exporter extends \core\external\persistent_exporter { $values->isunapproveallowed = $values->canreview && $values->isactive; } - $values->duedateformatted = userdate($this->persistent->get_duedate()); + $values->duedateformatted = userdate($this->persistent->get('duedate')); if ($this->persistent->is_based_on_template()) { $exporter = new template_exporter($this->related['template']); @@ -96,13 +96,13 @@ class plan_exporter extends \core\external\persistent_exporter { if (!empty($values->isinreview)) { // TODO Make this more efficient. - $userexporter = new user_summary_exporter(core_user::get_user($this->persistent->get_reviewerid(), '*', MUST_EXIST)); + $userexporter = new user_summary_exporter(core_user::get_user($this->persistent->get('reviewerid'), '*', MUST_EXIST)); $values->reviewer = $userexporter->export($output); } $commentareaexporter = new comment_area_exporter($this->persistent->get_comment_object()); $values->commentarea = $commentareaexporter->export($output); - $values->url = url::plan($this->persistent->get_id())->out(false); + $values->url = url::plan($this->persistent->get('id'))->out(false); return (array) $values; } diff --git a/competency/classes/external/template_exporter.php b/competency/classes/external/template_exporter.php index d90ad724f48..bc41e1c1b05 100644 --- a/competency/classes/external/template_exporter.php +++ b/competency/classes/external/template_exporter.php @@ -44,9 +44,9 @@ class template_exporter extends \core\external\persistent_exporter { protected function get_other_values(renderer_base $output) { $context = $this->persistent->get_context(); return array( - 'duedateformatted' => userdate($this->persistent->get_duedate()), - 'cohortscount' => template_cohort::count_records(array('templateid' => $this->persistent->get_id())), - 'planscount' => plan::count_records(array('templateid' => $this->persistent->get_id())), + 'duedateformatted' => userdate($this->persistent->get('duedate')), + 'cohortscount' => template_cohort::count_records(array('templateid' => $this->persistent->get('id'))), + 'planscount' => plan::count_records(array('templateid' => $this->persistent->get('id'))), 'canmanage' => $this->persistent->can_manage(), 'canread' => $this->persistent->can_read(), 'contextname' => $context->get_context_name(), diff --git a/competency/classes/external/user_competency_course_exporter.php b/competency/classes/external/user_competency_course_exporter.php index 706bd74d8a7..1a2374548fd 100644 --- a/competency/classes/external/user_competency_course_exporter.php +++ b/competency/classes/external/user_competency_course_exporter.php @@ -48,17 +48,17 @@ class user_competency_course_exporter extends \core\external\persistent_exporter protected function get_other_values(renderer_base $output) { $result = new stdClass(); - if ($this->persistent->get_grade() === null) { + if ($this->persistent->get('grade') === null) { $gradename = '-'; } else { - $gradename = $this->related['scale']->scale_items[$this->persistent->get_grade() - 1]; + $gradename = $this->related['scale']->scale_items[$this->persistent->get('grade') - 1]; } $result->gradename = $gradename; - if ($this->persistent->get_proficiency() === null) { + if ($this->persistent->get('proficiency') === null) { $proficiencyname = get_string('no'); } else { - $proficiencyname = get_string($this->persistent->get_proficiency() ? 'yes' : 'no'); + $proficiencyname = get_string($this->persistent->get('proficiency') ? 'yes' : 'no'); } $result->proficiencyname = $proficiencyname; diff --git a/competency/classes/external/user_competency_exporter.php b/competency/classes/external/user_competency_exporter.php index 019fb1f52a2..e2f2ee4327b 100644 --- a/competency/classes/external/user_competency_exporter.php +++ b/competency/classes/external/user_competency_exporter.php @@ -52,32 +52,32 @@ class user_competency_exporter extends \core\external\persistent_exporter { protected function get_other_values(renderer_base $output) { $result = new stdClass(); - if ($this->persistent->get_grade() === null) { + if ($this->persistent->get('grade') === null) { $gradename = '-'; } else { - $gradename = $this->related['scale']->scale_items[$this->persistent->get_grade() - 1]; + $gradename = $this->related['scale']->scale_items[$this->persistent->get('grade') - 1]; } $result->gradename = $gradename; - if ($this->persistent->get_proficiency() === null) { + if ($this->persistent->get('proficiency') === null) { $proficiencyname = get_string('no'); } else { - $proficiencyname = get_string($this->persistent->get_proficiency() ? 'yes' : 'no'); + $proficiencyname = get_string($this->persistent->get('proficiency') ? 'yes' : 'no'); } $result->proficiencyname = $proficiencyname; $statusname = '-'; - if ($this->persistent->get_status() != user_competency::STATUS_IDLE) { - $statusname = (string) user_competency::get_status_name($this->persistent->get_status()); + if ($this->persistent->get('status') != user_competency::STATUS_IDLE) { + $statusname = (string) user_competency::get_status_name($this->persistent->get('status')); } $result->statusname = $statusname; $result->canrequestreview = $this->persistent->can_request_review(); $result->canreview = $this->persistent->can_review(); - $result->isstatusidle = $this->persistent->get_status() == user_competency::STATUS_IDLE; - $result->isstatusinreview = $this->persistent->get_status() == user_competency::STATUS_IN_REVIEW; - $result->isstatuswaitingforreview = $this->persistent->get_status() == user_competency::STATUS_WAITING_FOR_REVIEW; + $result->isstatusidle = $this->persistent->get('status') == user_competency::STATUS_IDLE; + $result->isstatusinreview = $this->persistent->get('status') == user_competency::STATUS_IN_REVIEW; + $result->isstatuswaitingforreview = $this->persistent->get('status') == user_competency::STATUS_WAITING_FOR_REVIEW; $result->isrequestreviewallowed = $result->canrequestreview && $result->isstatusidle; $result->iscancelreviewrequestallowed = $result->canrequestreview && $result->isstatuswaitingforreview; @@ -86,11 +86,11 @@ class user_competency_exporter extends \core\external\persistent_exporter { if (!empty($result->isstatusinreview)) { // TODO Make this more efficient. - $userexporter = new user_summary_exporter(core_user::get_user($this->persistent->get_reviewerid(), '*', MUST_EXIST)); + $userexporter = new user_summary_exporter(core_user::get_user($this->persistent->get('reviewerid'), '*', MUST_EXIST)); $result->reviewer = $userexporter->export($output); } - $result->url = url::user_competency($this->persistent->get_id())->out(false); + $result->url = url::user_competency($this->persistent->get('id'))->out(false); return (array) $result; } diff --git a/competency/classes/external/user_competency_plan_exporter.php b/competency/classes/external/user_competency_plan_exporter.php index bfc6acc5110..d625fb50183 100644 --- a/competency/classes/external/user_competency_plan_exporter.php +++ b/competency/classes/external/user_competency_plan_exporter.php @@ -48,17 +48,17 @@ class user_competency_plan_exporter extends \core\external\persistent_exporter { protected function get_other_values(renderer_base $output) { $result = new stdClass(); - if ($this->persistent->get_grade() === null) { + if ($this->persistent->get('grade') === null) { $gradename = '-'; } else { - $gradename = $this->related['scale']->scale_items[$this->persistent->get_grade() - 1]; + $gradename = $this->related['scale']->scale_items[$this->persistent->get('grade') - 1]; } $result->gradename = $gradename; - if ($this->persistent->get_proficiency() === null) { + if ($this->persistent->get('proficiency') === null) { $proficiencyname = get_string('no'); } else { - $proficiencyname = get_string($this->persistent->get_proficiency() ? 'yes' : 'no'); + $proficiencyname = get_string($this->persistent->get('proficiency') ? 'yes' : 'no'); } $result->proficiencyname = $proficiencyname; diff --git a/competency/classes/external/user_evidence_exporter.php b/competency/classes/external/user_evidence_exporter.php index af5a575e70e..c9a42757133 100644 --- a/competency/classes/external/user_evidence_exporter.php +++ b/competency/classes/external/user_evidence_exporter.php @@ -88,7 +88,7 @@ class user_evidence_exporter extends \core\external\persistent_exporter { } $urlshort = ''; - $url = $this->persistent->get_url(); + $url = $this->persistent->get('url'); if (!empty($url)) { $murl = new moodle_url($url); $shorturl = preg_replace('@^https?://(www\.)?@', '', $murl->out(false)); diff --git a/competency/classes/persistent.php b/competency/classes/persistent.php index 7f792ef7107..61e6159c930 100644 --- a/competency/classes/persistent.php +++ b/competency/classes/persistent.php @@ -44,4 +44,23 @@ class_alias('core\\invalid_persistent_exception', 'core_competency\\invalid_pers * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ abstract class persistent extends \core\persistent { + /** + * Magic method to capture getters and setters. + * This is only available for competency persistents for backwards compatibility. + * It is recommended to use get('propertyname') and set('propertyname', 'value') directly. + * + * @param string $method Callee. + * @param array $arguments List of arguments. + * @return mixed + */ + final public function __call($method, $arguments) { + debugging('Use of magic setters and getters is deprecated. Use get() and set().', DEBUG_DEVELOPER); + if (strpos($method, 'get_') === 0) { + return $this->get(substr($method, 4)); + } else if (strpos($method, 'set_') === 0) { + return $this->set(substr($method, 4), $arguments[0]); + } + throw new coding_exception('Unexpected method call: ' . $method); + } + } diff --git a/competency/classes/plan.php b/competency/classes/plan.php index 91f397d7698..3d1363d9e82 100644 --- a/competency/classes/plan.php +++ b/competency/classes/plan.php @@ -119,8 +119,8 @@ class plan extends persistent { $this->beforeupdate = null; // During update. - if ($this->get_id()) { - $this->beforeupdate = new self($this->get_id()); + if ($this->get('id')) { + $this->beforeupdate = new self($this->get('id')); } } @@ -130,7 +130,7 @@ class plan extends persistent { * @return bool */ public function can_comment() { - return static::can_comment_user($this->get_userid()); + return static::can_comment_user($this->get('userid')); } /** @@ -140,9 +140,9 @@ class plan extends persistent { */ public function can_manage() { if ($this->is_draft()) { - return self::can_manage_user_draft($this->get_userid()); + return self::can_manage_user_draft($this->get('userid')); } - return self::can_manage_user($this->get_userid()); + return self::can_manage_user($this->get('userid')); } /** @@ -152,9 +152,9 @@ class plan extends persistent { */ public function can_read() { if ($this->is_draft()) { - return self::can_read_user_draft($this->get_userid()); + return self::can_read_user_draft($this->get('userid')); } - return self::can_read_user($this->get_userid()); + return self::can_read_user($this->get('userid')); } /** @@ -172,7 +172,7 @@ class plan extends persistent { * @return bool */ public function can_request_review() { - return self::can_request_review_user($this->get_userid()); + return self::can_request_review_user($this->get('userid')); } /** @@ -181,7 +181,7 @@ class plan extends persistent { * @return bool */ public function can_review() { - return self::can_review_user($this->get_userid()); + return self::can_review_user($this->get('userid')); } /** @@ -193,15 +193,15 @@ class plan extends persistent { global $CFG; require_once($CFG->dirroot . '/comment/lib.php'); - if (!$this->get_id()) { + if (!$this->get('id')) { throw new \coding_exception('The plan must exist.'); } $comment = new comment((object) array( - 'client_id' => 'plancommentarea' . $this->get_id(), + 'client_id' => 'plancommentarea' . $this->get('id'), 'context' => $this->get_context(), 'component' => 'competency', // This cannot be named 'core_competency'. - 'itemid' => $this->get_id(), + 'itemid' => $this->get('id'), 'area' => 'plan', 'showcount' => true, )); @@ -217,15 +217,15 @@ class plan extends persistent { public function get_competencies() { $competencies = array(); - if ($this->get_status() == self::STATUS_COMPLETE) { + if ($this->get('status') == self::STATUS_COMPLETE) { // Get the competencies from the archive of the plan. - $competencies = user_competency_plan::list_competencies($this->get_id(), $this->get_userid()); + $competencies = user_competency_plan::list_competencies($this->get('id'), $this->get('userid')); } else if ($this->is_based_on_template()) { // Get the competencies from the template. - $competencies = template_competency::list_competencies($this->get_templateid()); + $competencies = template_competency::list_competencies($this->get('templateid')); } else { // Get the competencies from the plan. - $competencies = plan_competency::list_competencies($this->get_id()); + $competencies = plan_competency::list_competencies($this->get('id')); } return $competencies; @@ -242,15 +242,15 @@ class plan extends persistent { public function get_competency($competencyid) { $competency = null; - if ($this->get_status() == self::STATUS_COMPLETE) { + if ($this->get('status') == self::STATUS_COMPLETE) { // Get the competency from the archive of the plan. - $competency = user_competency_plan::get_competency_by_planid($this->get_id(), $competencyid); + $competency = user_competency_plan::get_competency_by_planid($this->get('id'), $competencyid); } else if ($this->is_based_on_template()) { // Get the competency from the template. - $competency = template_competency::get_competency($this->get_templateid(), $competencyid); + $competency = template_competency::get_competency($this->get('templateid'), $competencyid); } else { // Get the competency from the plan. - $competency = plan_competency::get_competency($this->get_id(), $competencyid); + $competency = plan_competency::get_competency($this->get('id'), $competencyid); } return $competency; } @@ -261,7 +261,7 @@ class plan extends persistent { * @return context_user */ public function get_context() { - return context_user::instance($this->get_userid()); + return context_user::instance($this->get('userid')); } /** @@ -271,7 +271,7 @@ class plan extends persistent { */ public function get_statusname() { - $status = $this->get_status(); + $status = $this->get('status'); switch ($status) { case self::STATUS_DRAFT: @@ -303,7 +303,7 @@ class plan extends persistent { * @return template|null */ public function get_template() { - $templateid = $this->get_templateid(); + $templateid = $this->get('templateid'); if ($templateid === null) { return null; } @@ -319,7 +319,7 @@ class plan extends persistent { * @return boolean */ public function is_draft() { - return in_array($this->get_status(), static::get_draft_statuses()); + return in_array($this->get('status'), static::get_draft_statuses()); } /** @@ -348,7 +348,7 @@ class plan extends persistent { global $DB; // During create. - if (!$this->get_id()) { + if (!$this->get('id')) { // Check that the user exists. We do not need to do that on update because // the userid of a plan should never change. @@ -590,13 +590,13 @@ class plan extends persistent { } $params = array( - 'templateid' => $template->get_id(), + 'templateid' => $template->get('id'), 'status' => self::STATUS_COMPLETE, - 'name' => $template->get_shortname(), - 'description' => $template->get_description(), - 'descriptionformat' => $template->get_descriptionformat(), - 'duedate' => $template->get_duedate(), + 'name' => $template->get('shortname'), + 'description' => $template->get('description'), + 'descriptionformat' => $template->get('descriptionformat'), + 'duedate' => $template->get('duedate'), ); $sql = "UPDATE {" . self::TABLE . "} @@ -616,7 +616,7 @@ class plan extends persistent { * @return bool */ public function is_based_on_template() { - return $this->get_templateid() !== null; + return $this->get('templateid') !== null; } /** @@ -625,7 +625,7 @@ class plan extends persistent { * @return bool */ public function can_be_edited() { - return !$this->is_based_on_template() && $this->get_status() != self::STATUS_COMPLETE && $this->can_manage(); + return !$this->is_based_on_template() && $this->get('status') != self::STATUS_COMPLETE && $this->can_manage(); } /** @@ -640,15 +640,15 @@ class plan extends persistent { // We do not check duedate when plan is draft, complete, unset, or based on a template. if ($this->is_based_on_template() || $this->is_draft() - || $this->get_status() == self::STATUS_COMPLETE + || $this->get('status') == self::STATUS_COMPLETE || empty($value)) { return true; } // During update. - if ($this->get_id()) { - $before = $this->beforeupdate->get_duedate(); - $beforestatus = $this->beforeupdate->get_status(); + if ($this->get('id')) { + $before = $this->beforeupdate->get('duedate'); + $beforestatus = $this->beforeupdate->get('status'); // The value has not changed, then it's always OK. Though if we're going // from draft to active it has to has to be validated. diff --git a/competency/classes/plan_competency.php b/competency/classes/plan_competency.php index 57a72ed526e..31cbc6f4449 100644 --- a/competency/classes/plan_competency.php +++ b/competency/classes/plan_competency.php @@ -117,8 +117,8 @@ class plan_competency extends persistent { * @return void */ protected function before_validate() { - if (($this->get_id() && $this->get_sortorder() === null) || !$this->get_id()) { - $this->set_sortorder($this->count_records(array('planid' => $this->get_planid()))); + if (($this->get('id') && $this->get('sortorder') === null) || !$this->get('id')) { + $this->set('sortorder', $this->count_records(array('planid' => $this->get('planid')))); } } @@ -162,7 +162,7 @@ class plan_competency extends persistent { $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 WHERE planid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_planid(), $this->get_sortorder())); + $DB->execute($sql, array($this->get('planid'), $this->get('sortorder'))); } /** diff --git a/competency/classes/related_competency.php b/competency/classes/related_competency.php index 58b548e230a..3ef7cedee1e 100644 --- a/competency/classes/related_competency.php +++ b/competency/classes/related_competency.php @@ -75,18 +75,18 @@ class related_competency extends persistent { */ protected function validate_relatedcompetencyid($data) { - if ($this->get_competencyid() == $data) { + if ($this->get('competencyid') == $data) { // A competency cannot be related to itself. return new lang_string('invaliddata', 'error'); - } if ($this->get_competencyid() > $data) { + } if ($this->get('competencyid') > $data) { // The competency ID must be lower than the related competency ID. return new lang_string('invaliddata', 'error'); } else if (!competency::record_exists($data)) { return new lang_string('invaliddata', 'error'); - } else if (!competency::share_same_framework(array($data, $this->get_competencyid()))) { + } else if (!competency::share_same_framework(array($data, $this->get('competencyid')))) { // The competencies must belong to the same framework. return new lang_string('invaliddata', 'error'); } @@ -110,17 +110,17 @@ class related_competency extends persistent { // Lower id always as competencyid so we know which one is competencyid and which one relatedcompetencyid. $relation = new static(); if ($competencyid > $relatedcompetencyid) { - $relation->set_competencyid($relatedcompetencyid); - $relation->set_relatedcompetencyid($competencyid); + $relation->set('competencyid', $relatedcompetencyid); + $relation->set('relatedcompetencyid', $competencyid); } else { - $relation->set_competencyid($competencyid); - $relation->set_relatedcompetencyid($relatedcompetencyid); + $relation->set('competencyid', $competencyid); + $relation->set('relatedcompetencyid', $relatedcompetencyid); } // We can do it because we have bidirectional relations in the DB. $params = array( - 'competencyid' => $relation->get_competencyid(), - 'relatedcompetencyid' => $relation->get_relatedcompetencyid() + 'competencyid' => $relation->get('competencyid'), + 'relatedcompetencyid' => $relation->get('relatedcompetencyid') ); if ($record = $DB->get_record(self::TABLE, $params)) { $relation->from_record($record); diff --git a/competency/classes/template.php b/competency/classes/template.php index 93d54b520f3..6cc0d3fb00f 100644 --- a/competency/classes/template.php +++ b/competency/classes/template.php @@ -93,8 +93,8 @@ class template extends persistent { $this->beforeupdate = null; // During update. - if ($this->get_id()) { - $this->beforeupdate = new self($this->get_id()); + if ($this->get('id')) { + $this->beforeupdate = new self($this->get('id')); } } @@ -142,7 +142,7 @@ class template extends persistent { * @return context The context */ public function get_context() { - return context::instance_by_id($this->get_contextid()); + return context::instance_by_id($this->get('contextid')); } /** @@ -174,8 +174,8 @@ class template extends persistent { protected function validate_duedate($value) { // During update. - if ($this->get_id()) { - $before = $this->beforeupdate->get_duedate(); + if ($this->get('id')) { + $before = $this->beforeupdate->get('duedate'); // The value has not changed, then it's always OK. if ($before == $value) { @@ -199,7 +199,7 @@ class template extends persistent { * @return boolean */ public function has_plans() { - return plan::has_records_for_template($this->get_id()); + return plan::has_records_for_template($this->get('id')); } } diff --git a/competency/classes/template_cohort.php b/competency/classes/template_cohort.php index 5387c06d8f0..bfc1a80db5f 100644 --- a/competency/classes/template_cohort.php +++ b/competency/classes/template_cohort.php @@ -224,8 +224,8 @@ class template_cohort extends persistent { unset($usertemplate->userid); unset($usertemplate->uniqueid); $template = new template(0, $usertemplate); - $missingplans[$template->get_id()]['template'] = $template; - $missingplans[$template->get_id()]['userids'][] = $userid; + $missingplans[$template->get('id')]['template'] = $template; + $missingplans[$template->get('id')]['userids'][] = $userid; } } return array_values($missingplans); diff --git a/competency/classes/template_competency.php b/competency/classes/template_competency.php index 62a1ca72904..3e0c8f8b40e 100644 --- a/competency/classes/template_competency.php +++ b/competency/classes/template_competency.php @@ -234,8 +234,8 @@ class template_competency extends persistent { * @return void */ protected function before_validate() { - if (($this->get_id() && $this->get_sortorder() === null) || !$this->get_id()) { - $this->set_sortorder($this->count_records(array('templateid' => $this->get_templateid()))); + if (($this->get('id') && $this->get('sortorder') === null) || !$this->get('id')) { + $this->set('sortorder', $this->count_records(array('templateid' => $this->get('templateid')))); } } @@ -279,7 +279,7 @@ class template_competency extends persistent { $table = '{' . self::TABLE . '}'; $sql = "UPDATE $table SET sortorder = sortorder -1 WHERE templateid = ? AND sortorder > ?"; - $DB->execute($sql, array($this->get_templateid(), $this->get_sortorder())); + $DB->execute($sql, array($this->get('templateid'), $this->get('sortorder'))); } /** diff --git a/competency/classes/user_competency.php b/competency/classes/user_competency.php index 1cf12728399..0f99de9af83 100644 --- a/competency/classes/user_competency.php +++ b/competency/classes/user_competency.php @@ -96,7 +96,7 @@ class user_competency extends persistent { * @return bool */ public function can_comment() { - return static::can_comment_user($this->get_userid()); + return static::can_comment_user($this->get('userid')); } /** @@ -105,7 +105,7 @@ class user_competency extends persistent { * @return bool */ public function can_read() { - return static::can_read_user($this->get_userid()); + return static::can_read_user($this->get('userid')); } /** @@ -114,7 +114,7 @@ class user_competency extends persistent { * @return bool */ public function can_read_comments() { - return static::can_read_comments_user($this->get_userid()); + return static::can_read_comments_user($this->get('userid')); } /** @@ -123,7 +123,7 @@ class user_competency extends persistent { * @return bool */ public function can_request_review() { - return static::can_request_review_user($this->get_userid()); + return static::can_request_review_user($this->get('userid')); } /** @@ -132,7 +132,7 @@ class user_competency extends persistent { * @return bool */ public function can_review() { - return static::can_review_user($this->get_userid()); + return static::can_review_user($this->get('userid')); } /** @@ -189,14 +189,14 @@ class user_competency extends persistent { global $CFG; require_once($CFG->dirroot . '/comment/lib.php'); - if (!$this->get_id()) { + if (!$this->get('id')) { throw new coding_exception('The user competency record must exist.'); } $comment = new comment((object) array( 'context' => $this->get_context(), 'component' => 'competency', // This cannot be named 'core_competency'. - 'itemid' => $this->get_id(), + 'itemid' => $this->get('id'), 'area' => 'user_competency', 'showcount' => true, )); @@ -210,7 +210,7 @@ class user_competency extends persistent { * @return competency Competency Object */ public function get_competency() { - return new competency($this->get_competencyid()); + return new competency($this->get('competencyid')); } /** @@ -219,7 +219,7 @@ class user_competency extends persistent { * @return context The context. */ public function get_context() { - return context_user::instance($this->get_userid()); + return context_user::instance($this->get('userid')); } /** @@ -233,7 +233,7 @@ class user_competency extends persistent { * @return plans[] */ public function get_plans() { - return plan::get_by_user_and_competency($this->get_userid(), $this->get_competencyid()); + return plan::get_by_user_and_competency($this->get('userid'), $this->get('competencyid')); } /** @@ -499,7 +499,7 @@ class user_competency extends persistent { } else { $ids = array(); foreach ($competenciesorids as $comp) { - $ids[] = $comp->get_id(); + $ids[] = $comp->get('id'); } } diff --git a/competency/classes/user_competency_course.php b/competency/classes/user_competency_course.php index c1390613fe3..e0e7d4e3b41 100644 --- a/competency/classes/user_competency_course.php +++ b/competency/classes/user_competency_course.php @@ -74,7 +74,7 @@ class user_competency_course extends persistent { * @return competency Competency Object */ public function get_competency() { - return new competency($this->get_competencyid()); + return new competency($this->get('competencyid')); } /** @@ -83,7 +83,7 @@ class user_competency_course extends persistent { * @return context The context. */ public function get_context() { - return context_user::instance($this->get_userid()); + return context_user::instance($this->get('userid')); } /** @@ -218,7 +218,7 @@ class user_competency_course extends persistent { } else { $ids = array(); foreach ($competenciesorids as $comp) { - $ids[] = $comp->get_id(); + $ids[] = $comp->get('id'); } } diff --git a/competency/classes/user_competency_plan.php b/competency/classes/user_competency_plan.php index 9614a93db72..3880a2aa2df 100644 --- a/competency/classes/user_competency_plan.php +++ b/competency/classes/user_competency_plan.php @@ -77,7 +77,7 @@ class user_competency_plan extends persistent { * @return competency Competency Object */ public function get_competency() { - return new competency($this->get_competencyid()); + return new competency($this->get('competencyid')); } /** @@ -86,7 +86,7 @@ class user_competency_plan extends persistent { * @return context The context. */ public function get_context() { - return context_user::instance($this->get_userid()); + return context_user::instance($this->get('userid')); } /** @@ -250,7 +250,7 @@ class user_competency_plan extends persistent { } else { $ids = array(); foreach ($competenciesorids as $comp) { - $ids[] = $comp->get_id(); + $ids[] = $comp->get('id'); } } diff --git a/competency/classes/user_evidence.php b/competency/classes/user_evidence.php index 50747d32f28..ffbc9d440d4 100644 --- a/competency/classes/user_evidence.php +++ b/competency/classes/user_evidence.php @@ -75,7 +75,7 @@ class user_evidence extends persistent { * @return bool */ public function can_manage() { - return self::can_manage_user($this->get_userid()); + return self::can_manage_user($this->get('userid')); } /** @@ -84,7 +84,7 @@ class user_evidence extends persistent { * @return bool */ public function can_read() { - return self::can_read_user($this->get_userid()); + return self::can_read_user($this->get('userid')); } /** @@ -93,21 +93,21 @@ class user_evidence extends persistent { * @return context */ public function get_context() { - return context_user::instance($this->get_userid()); + return context_user::instance($this->get('userid')); } /** * Get link competencies. */ public function get_competencies() { - return user_evidence_competency::get_competencies_by_userevidenceid($this->get_id()); + return user_evidence_competency::get_competencies_by_userevidenceid($this->get('id')); } /** * Get link user competencies. */ public function get_user_competencies() { - return user_evidence_competency::get_user_competencies_by_userevidenceid($this->get_id()); + return user_evidence_competency::get_user_competencies_by_userevidenceid($this->get('id')); } /** @@ -116,7 +116,7 @@ class user_evidence extends persistent { * @return bool */ public function user_has_plan() { - return plan::record_exists_select('userid = ?', array($this->get_userid())); + return plan::record_exists_select('userid = ?', array($this->get('userid'))); } /** @@ -126,7 +126,7 @@ class user_evidence extends persistent { */ public function get_files() { $fs = get_file_storage(); - $files = $fs->get_area_files($this->get_context()->id, 'core_competency', 'userevidence', $this->get_id(), + $files = $fs->get_area_files($this->get_context()->id, 'core_competency', 'userevidence', $this->get('id'), 'filename', false); return $files; } @@ -157,7 +157,7 @@ class user_evidence extends persistent { global $DB; // During create. - if (!$this->get_id()) { + if (!$this->get('id')) { // Check that the user exists. We do not need to do that on update because // the userid of an evidence should never change. diff --git a/competency/lib.php b/competency/lib.php index 7472db1dc27..847bd07f80d 100644 --- a/competency/lib.php +++ b/competency/lib.php @@ -48,9 +48,9 @@ function core_competency_comment_add($comment, $params) { $uc = new user_competency($params->itemid); // Message both the user and the reviewer, except when they are the author of the message. - $recipients = array($uc->get_userid()); - if ($uc->get_reviewerid()) { - $recipients[] = $uc->get_reviewerid(); + $recipients = array($uc->get('userid')); + if ($uc->get('reviewerid')) { + $recipients[] = $uc->get('reviewerid'); } $recipients = array_diff($recipients, array($comment->userid)); if (empty($recipients)) { @@ -66,17 +66,17 @@ function core_competency_comment_add($comment, $params) { // Get the competency. $competency = $uc->get_competency(); - $competencyname = format_string($competency->get_shortname(), true, array('context' => $competency->get_context())); + $competencyname = format_string($competency->get('shortname'), true, array('context' => $competency->get_context())); // We want to send a message for one plan, trying to find an active one first, or the last modified one. $plan = null; $plans = $uc->get_plans(); foreach ($plans as $candidate) { - if ($candidate->get_status() == plan::STATUS_ACTIVE) { + if ($candidate->get('status') == plan::STATUS_ACTIVE) { $plan = $candidate; break; - } else if (!empty($plan) && $plan->get_timemodified() < $candidate->get_timemodified()) { + } else if (!empty($plan) && $plan->get('timemodified') < $candidate->get('timemodified')) { $plan = $candidate; } else if (empty($plan)) { @@ -88,10 +88,10 @@ function core_competency_comment_add($comment, $params) { // TODO MDL-52749 Replace the link to the plan with the user competency page. if (empty($plan)) { $urlname = get_string('userplans', 'core_competency'); - $url = url::plans($uc->get_userid()); + $url = url::plans($uc->get('userid')); } else { $urlname = $competencyname; - $url = url::user_competency_in_plan($uc->get_userid(), $uc->get_competencyid(), $plan->get_id()); + $url = url::user_competency_in_plan($uc->get('userid'), $uc->get('competencyid'), $plan->get('id')); } // Construct the message content. @@ -143,9 +143,9 @@ function core_competency_comment_add($comment, $params) { $plan = new plan($params->itemid); // Message both the user and the reviewer, except when they are the author of the message. - $recipients = array($plan->get_userid()); - if ($plan->get_reviewerid()) { - $recipients[] = $plan->get_reviewerid(); + $recipients = array($plan->get('userid')); + if ($plan->get('reviewerid')) { + $recipients[] = $plan->get('reviewerid'); } $recipients = array_diff($recipients, array($comment->userid)); if (empty($recipients)) { @@ -159,9 +159,9 @@ function core_competency_comment_add($comment, $params) { } $fullname = fullname($user); - $planname = format_string($plan->get_name(), true, array('context' => $plan->get_context())); + $planname = format_string($plan->get('name'), true, array('context' => $plan->get_context())); $urlname = $planname; - $url = url::plan($plan->get_id()); + $url = url::plan($plan->get('id')); // Construct the message content. $fullmessagehtml = get_string('usercommentedonaplanhtml', 'core_competency', array( diff --git a/competency/tests/api_test.php b/competency/tests/api_test.php index 3b053e8c352..e29f9d6a7fa 100644 --- a/competency/tests/api_test.php +++ b/competency/tests/api_test.php @@ -177,16 +177,16 @@ class core_competency_api_testcase extends advanced_testcase { $syscontext = context_system::instance(); $template = api::create_template((object) array('shortname' => 'testing', 'contextid' => $syscontext->id)); - $this->assertEquals('testing', $template->get_shortname()); - $this->assertEquals($syscontext->id, $template->get_contextid()); + $this->assertEquals('testing', $template->get('shortname')); + $this->assertEquals($syscontext->id, $template->get('contextid')); // Simple update. - api::update_template((object) array('id' => $template->get_id(), 'shortname' => 'success')); - $template = api::read_template($template->get_id()); - $this->assertEquals('success', $template->get_shortname()); + api::update_template((object) array('id' => $template->get('id'), 'shortname' => 'success')); + $template = api::read_template($template->get('id')); + $this->assertEquals('success', $template->get('shortname')); // Trying to change the context. - api::update_template((object) array('id' => $template->get_id(), 'contextid' => context_coursecat::instance($cat->id))); + api::update_template((object) array('id' => $template->get('id'), 'contextid' => context_coursecat::instance($cat->id))); } /** @@ -229,35 +229,35 @@ class core_competency_api_testcase extends advanced_testcase { $result = api::list_frameworks('shortname', 'DESC', null, 3, context_system::instance()); $f = (object) array_shift($result); - $this->assertEquals($framework3->get_id(), $f->get_id()); + $this->assertEquals($framework3->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->get_id()); + $this->assertEquals($framework2->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework1->get_id(), $f->get_id()); + $this->assertEquals($framework1->get('id'), $f->get('id')); // Get frameworks list order by idnumber asc. $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance()); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->get_id()); + $this->assertEquals($framework2->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework3->get_id(), $f->get_id()); + $this->assertEquals($framework3->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework1->get_id(), $f->get_id()); + $this->assertEquals($framework1->get('id'), $f->get('id')); // Repeat excluding the non-visible ones. $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance(), 'self', true); $this->assertCount(2, $result); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->get_id()); + $this->assertEquals($framework2->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework1->get_id(), $f->get_id()); + $this->assertEquals($framework1->get('id'), $f->get('id')); // Search by query string, trying match on shortname. $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance(), 'self', false, 'crisp'); $this->assertCount(1, $result); $f = (object) array_shift($result); - $this->assertEquals($framework3->get_id(), $f->get_id()); + $this->assertEquals($framework3->get('id'), $f->get('id')); // Search by query string, trying match on shortname, but hidden. $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance(), 'self', true, 'crisp'); @@ -267,15 +267,15 @@ class core_competency_api_testcase extends advanced_testcase { $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance(), 'self', false, 'apple'); $this->assertCount(1, $result); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->get_id()); + $this->assertEquals($framework2->get('id'), $f->get('id')); // Search by query string, trying match on both. $result = api::list_frameworks('idnumber', 'ASC', null, 3, context_system::instance(), 'self', false, 'bee'); $this->assertCount(2, $result); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->get_id()); + $this->assertEquals($framework2->get('id'), $f->get('id')); $f = (object) array_shift($result); - $this->assertEquals($framework3->get_id(), $f->get_id()); + $this->assertEquals($framework3->get('id'), $f->get('id')); } /** @@ -296,56 +296,56 @@ class core_competency_api_testcase extends advanced_testcase { 'contextid' => $syscontext->id ); $framework = $lpg->create_framework($params); - $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency41 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), - 'parentid' => $competency4->get_id()) + $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency41 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), + 'parentid' => $competency4->get('id')) ); - $competency42 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), - 'parentid' => $competency4->get_id()) + $competency42 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), + 'parentid' => $competency4->get('id')) ); - $competencyidnumbers = array($competency1->get_idnumber(), - $competency2->get_idnumber(), - $competency3->get_idnumber(), - $competency4->get_idnumber(), - $competency41->get_idnumber(), - $competency42->get_idnumber() + $competencyidnumbers = array($competency1->get('idnumber'), + $competency2->get('idnumber'), + $competency3->get('idnumber'), + $competency4->get('idnumber'), + $competency41->get('idnumber'), + $competency42->get('idnumber') ); $config = json_encode(array( 'base' => array('points' => 4), 'competencies' => array( - array('id' => $competency41->get_id(), 'points' => 3, 'required' => 0), - array('id' => $competency42->get_id(), 'points' => 2, 'required' => 1), + array('id' => $competency41->get('id'), 'points' => 3, 'required' => 0), + array('id' => $competency42->get('id'), 'points' => 2, 'required' => 1), ) )); - $competency4->set_ruletype('core_competency\competency_rule_points'); - $competency4->set_ruleoutcome(\core_competency\competency::OUTCOME_EVIDENCE); - $competency4->set_ruleconfig($config); + $competency4->set('ruletype', 'core_competency\competency_rule_points'); + $competency4->set('ruleoutcome', \core_competency\competency::OUTCOME_EVIDENCE); + $competency4->set('ruleconfig', $config); $competency4->update(); - api::add_related_competency($competency1->get_id(), $competency2->get_id()); - api::add_related_competency($competency3->get_id(), $competency4->get_id()); + api::add_related_competency($competency1->get('id'), $competency2->get('id')); + api::add_related_competency($competency3->get('id'), $competency4->get('id')); - $frameworkduplicated1 = api::duplicate_framework($framework->get_id()); - $frameworkduplicated2 = api::duplicate_framework($framework->get_id()); + $frameworkduplicated1 = api::duplicate_framework($framework->get('id')); + $frameworkduplicated2 = api::duplicate_framework($framework->get('id')); - $this->assertEquals($framework->get_idnumber().'_1', $frameworkduplicated1->get_idnumber()); - $this->assertEquals($framework->get_idnumber().'_2', $frameworkduplicated2->get_idnumber()); + $this->assertEquals($framework->get('idnumber').'_1', $frameworkduplicated1->get('idnumber')); + $this->assertEquals($framework->get('idnumber').'_2', $frameworkduplicated2->get('idnumber')); - $competenciesfr1 = api::list_competencies(array('competencyframeworkid' => $frameworkduplicated1->get_id())); - $competenciesfr2 = api::list_competencies(array('competencyframeworkid' => $frameworkduplicated2->get_id())); + $competenciesfr1 = api::list_competencies(array('competencyframeworkid' => $frameworkduplicated1->get('id'))); + $competenciesfr2 = api::list_competencies(array('competencyframeworkid' => $frameworkduplicated2->get('id'))); $competencyidsfr1 = array(); $competencyidsfr2 = array(); foreach ($competenciesfr1 as $cmp) { - $competencyidsfr1[] = $cmp->get_idnumber(); + $competencyidsfr1[] = $cmp->get('idnumber'); } foreach ($competenciesfr2 as $cmp) { - $competencyidsfr2[] = $cmp->get_idnumber(); + $competencyidsfr2[] = $cmp->get('idnumber'); } $this->assertEmpty(array_diff($competencyidsfr1, $competencyidnumbers)); @@ -358,14 +358,14 @@ class core_competency_api_testcase extends advanced_testcase { $compduplicated1 = current($competenciesfr1); $relatedcompetencies = $compduplicated1->get_related_competencies(); $comprelated = current($relatedcompetencies); - $this->assertEquals($comprelated->get_idnumber(), $competency2->get_idnumber()); + $this->assertEquals($comprelated->get('idnumber'), $competency2->get('idnumber')); // Check if config rule have been ported correctly. $competency4duplicated = competency::get_record(array( - 'idnumber' => $competency4->get_idnumber(), - 'competencyframeworkid' => $frameworkduplicated2->get_id() + 'idnumber' => $competency4->get('idnumber'), + 'competencyframeworkid' => $frameworkduplicated2->get('id') )); - $configduplicated = json_decode($competency4duplicated->get_ruleconfig(), true); + $configduplicated = json_decode($competency4duplicated->get('ruleconfig'), true); $configorigin = json_decode($config, true); // Check that the 2 config have the same base. $this->assertEquals($configorigin['base'], $configduplicated['base']); @@ -380,9 +380,9 @@ class core_competency_api_testcase extends advanced_testcase { // Test duplicate an empty framework. $emptyfrm = $lpg->create_framework(); - $emptyfrmduplicated = api::duplicate_framework($emptyfrm->get_id()); - $this->assertEquals($emptyfrm->get_idnumber().'_1', $emptyfrmduplicated->get_idnumber()); - $nbcomp = api::count_competencies(array('competencyframeworkid' => $emptyfrmduplicated->get_id())); + $emptyfrmduplicated = api::duplicate_framework($emptyfrm->get('id')); + $this->assertEquals($emptyfrm->get('idnumber').'_1', $emptyfrmduplicated->get('idnumber')); + $nbcomp = api::count_competencies(array('competencyframeworkid' => $emptyfrmduplicated->get('id'))); $this->assertEquals(0, $nbcomp); } @@ -498,7 +498,7 @@ class core_competency_api_testcase extends advanced_testcase { $plan = api::create_plan((object)$plan); // Silently transition to complete status to avoid errors about transitioning to complete. - $plan->set_status(\core_competency\plan::STATUS_COMPLETE); + $plan->set('status', \core_competency\plan::STATUS_COMPLETE); $plan->update(); $record = $plan->to_record(); @@ -525,9 +525,9 @@ class core_competency_api_testcase extends advanced_testcase { $plan = api::create_plan_from_template($tpl, $u1->id); $record = $plan->to_record(); $this->assertInstanceOf('\core_competency\plan', $plan); - $this->assertTrue(\core_competency\plan::record_exists($plan->get_id())); - $this->assertEquals($tpl->get_id(), $plan->get_templateid()); - $this->assertEquals($u1->id, $plan->get_userid()); + $this->assertTrue(\core_competency\plan::record_exists($plan->get('id'))); + $this->assertEquals($tpl->get('id'), $plan->get('templateid')); + $this->assertEquals($u1->id, $plan->get('userid')); $this->assertTrue($plan->is_based_on_template()); // Creating a plan that already exists. @@ -549,7 +549,7 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $tpl1 = $lpg->create_template(); $tpl2 = $lpg->create_template(); - $up1 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get_id())); + $up1 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get('id'))); $up2 = $lpg->create_plan(array('userid' => $u2->id, 'templateid' => null)); try { @@ -565,7 +565,7 @@ class core_competency_api_testcase extends advanced_testcase { try { // Trying to switch to another template. $record = $up1->to_record(); - $record->templateid = $tpl2->get_id(); + $record->templateid = $tpl2->get('id'); api::update_plan($record); $this->fail('A plan cannot be moved to another template.'); } catch (coding_exception $e) { @@ -575,7 +575,7 @@ class core_competency_api_testcase extends advanced_testcase { try { // Trying to switch to using a template. $record = $up2->to_record(); - $record->templateid = $tpl1->get_id(); + $record->templateid = $tpl1->get('id'); api::update_plan($record); $this->fail('A plan cannot be update to use a template.'); } catch (coding_exception $e) { @@ -593,34 +593,34 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $f1 = $lpg->create_framework(); $f2 = $lpg->create_framework(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $tpl1 = $lpg->create_template(); $tpl2 = $lpg->create_template(); - $tplc1a = $lpg->create_template_competency(array('templateid' => $tpl1->get_id(), 'competencyid' => $c1a->get_id(), + $tplc1a = $lpg->create_template_competency(array('templateid' => $tpl1->get('id'), 'competencyid' => $c1a->get('id'), 'sortorder' => 9)); - $tplc1b = $lpg->create_template_competency(array('templateid' => $tpl1->get_id(), 'competencyid' => $c1b->get_id(), + $tplc1b = $lpg->create_template_competency(array('templateid' => $tpl1->get('id'), 'competencyid' => $c1b->get('id'), 'sortorder' => 8)); - $tplc2a = $lpg->create_template_competency(array('templateid' => $tpl2->get_id(), 'competencyid' => $c2a->get_id())); + $tplc2a = $lpg->create_template_competency(array('templateid' => $tpl2->get('id'), 'competencyid' => $c2a->get('id'))); - $plan1 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get_id(), 'status' => plan::STATUS_ACTIVE)); - $plan2 = $lpg->create_plan(array('userid' => $u2->id, 'templateid' => $tpl2->get_id())); - $plan3 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get_id(), 'status' => plan::STATUS_COMPLETE)); + $plan1 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get('id'), 'status' => plan::STATUS_ACTIVE)); + $plan2 = $lpg->create_plan(array('userid' => $u2->id, 'templateid' => $tpl2->get('id'))); + $plan3 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get('id'), 'status' => plan::STATUS_COMPLETE)); // Check that we have what we expect at this stage. - $this->assertEquals(2, \core_competency\template_competency::count_records(array('templateid' => $tpl1->get_id()))); - $this->assertEquals(1, \core_competency\template_competency::count_records(array('templateid' => $tpl2->get_id()))); - $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan1->get_id()))); - $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan2->get_id()))); + $this->assertEquals(2, \core_competency\template_competency::count_records(array('templateid' => $tpl1->get('id')))); + $this->assertEquals(1, \core_competency\template_competency::count_records(array('templateid' => $tpl2->get('id')))); + $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan1->get('id')))); + $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan2->get('id')))); $this->assertTrue($plan1->is_based_on_template()); $this->assertTrue($plan2->is_based_on_template()); // Let's do this! - $tpl1comps = \core_competency\template_competency::list_competencies($tpl1->get_id(), true); - $tpl2comps = \core_competency\template_competency::list_competencies($tpl2->get_id(), true); + $tpl1comps = \core_competency\template_competency::list_competencies($tpl1->get('id'), true); + $tpl2comps = \core_competency\template_competency::list_competencies($tpl2->get('id'), true); api::unlink_plan_from_template($plan1); @@ -628,14 +628,14 @@ class core_competency_api_testcase extends advanced_testcase { $plan2->read(); $this->assertCount(2, $tpl1comps); $this->assertCount(1, $tpl2comps); - $this->assertEquals(2, \core_competency\template_competency::count_records(array('templateid' => $tpl1->get_id()))); - $this->assertEquals(1, \core_competency\template_competency::count_records(array('templateid' => $tpl2->get_id()))); - $this->assertEquals(2, \core_competency\plan_competency::count_records(array('planid' => $plan1->get_id()))); - $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan2->get_id()))); + $this->assertEquals(2, \core_competency\template_competency::count_records(array('templateid' => $tpl1->get('id')))); + $this->assertEquals(1, \core_competency\template_competency::count_records(array('templateid' => $tpl2->get('id')))); + $this->assertEquals(2, \core_competency\plan_competency::count_records(array('planid' => $plan1->get('id')))); + $this->assertEquals(0, \core_competency\plan_competency::count_records(array('planid' => $plan2->get('id')))); $this->assertFalse($plan1->is_based_on_template()); - $this->assertEquals($tpl1->get_id(), $plan1->get_origtemplateid()); + $this->assertEquals($tpl1->get('id'), $plan1->get('origtemplateid')); $this->assertTrue($plan2->is_based_on_template()); - $this->assertEquals(null, $plan2->get_origtemplateid()); + $this->assertEquals(null, $plan2->get('origtemplateid')); // Check we can unlink draft plan. try { @@ -653,15 +653,15 @@ class core_competency_api_testcase extends advanced_testcase { } // Even the order remains. - $plan1comps = \core_competency\plan_competency::list_competencies($plan1->get_id()); + $plan1comps = \core_competency\plan_competency::list_competencies($plan1->get('id')); $before = reset($tpl1comps); $after = reset($plan1comps); - $this->assertEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); + $this->assertEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); $before = next($tpl1comps); $after = next($plan1comps); - $this->assertEquals($before->get_id(), $after->get_id()); - $this->assertEquals($before->get_sortorder(), $after->get_sortorder()); + $this->assertEquals($before->get('id'), $after->get('id')); + $this->assertEquals($before->get('sortorder'), $after->get('sortorder')); } public function test_update_template_updates_plans() { @@ -677,11 +677,11 @@ class core_competency_api_testcase extends advanced_testcase { // Create plans with data not matching templates. $time = time(); - $plan1 = $lpg->create_plan(array('templateid' => $tpl1->get_id(), 'userid' => $u1->id, + $plan1 = $lpg->create_plan(array('templateid' => $tpl1->get('id'), 'userid' => $u1->id, 'name' => 'Not good name', 'duedate' => $time + 3600, 'description' => 'Ahah', 'descriptionformat' => FORMAT_MARKDOWN)); - $plan2 = $lpg->create_plan(array('templateid' => $tpl1->get_id(), 'userid' => $u2->id, + $plan2 = $lpg->create_plan(array('templateid' => $tpl1->get('id'), 'userid' => $u2->id, 'name' => 'Not right name', 'duedate' => $time + 3601, 'description' => 'Ahah', 'descriptionformat' => FORMAT_PLAIN)); - $plan3 = $lpg->create_plan(array('templateid' => $tpl2->get_id(), 'userid' => $u1->id, + $plan3 = $lpg->create_plan(array('templateid' => $tpl2->get('id'), 'userid' => $u1->id, 'name' => 'Not sweet name', 'duedate' => $time + 3602, 'description' => 'Ahah', 'descriptionformat' => FORMAT_PLAIN)); // Prepare our expectations. @@ -689,38 +689,38 @@ class core_competency_api_testcase extends advanced_testcase { $plan2->read(); $plan3->read(); - $this->assertEquals($tpl1->get_id(), $plan1->get_templateid()); - $this->assertEquals($tpl1->get_id(), $plan2->get_templateid()); - $this->assertEquals($tpl2->get_id(), $plan3->get_templateid()); - $this->assertNotEquals($tpl1->get_shortname(), $plan1->get_name()); - $this->assertNotEquals($tpl1->get_shortname(), $plan2->get_name()); - $this->assertNotEquals($tpl2->get_shortname(), $plan3->get_name()); - $this->assertNotEquals($tpl1->get_description(), $plan1->get_description()); - $this->assertNotEquals($tpl1->get_description(), $plan2->get_description()); - $this->assertNotEquals($tpl2->get_description(), $plan3->get_description()); - $this->assertNotEquals($tpl1->get_descriptionformat(), $plan1->get_descriptionformat()); - $this->assertNotEquals($tpl1->get_descriptionformat(), $plan2->get_descriptionformat()); - $this->assertNotEquals($tpl2->get_descriptionformat(), $plan3->get_descriptionformat()); - $this->assertNotEquals($tpl1->get_duedate(), $plan1->get_duedate()); - $this->assertNotEquals($tpl1->get_duedate(), $plan2->get_duedate()); - $this->assertNotEquals($tpl2->get_duedate(), $plan3->get_duedate()); + $this->assertEquals($tpl1->get('id'), $plan1->get('templateid')); + $this->assertEquals($tpl1->get('id'), $plan2->get('templateid')); + $this->assertEquals($tpl2->get('id'), $plan3->get('templateid')); + $this->assertNotEquals($tpl1->get('shortname'), $plan1->get('name')); + $this->assertNotEquals($tpl1->get('shortname'), $plan2->get('name')); + $this->assertNotEquals($tpl2->get('shortname'), $plan3->get('name')); + $this->assertNotEquals($tpl1->get('description'), $plan1->get('description')); + $this->assertNotEquals($tpl1->get('description'), $plan2->get('description')); + $this->assertNotEquals($tpl2->get('description'), $plan3->get('description')); + $this->assertNotEquals($tpl1->get('descriptionformat'), $plan1->get('descriptionformat')); + $this->assertNotEquals($tpl1->get('descriptionformat'), $plan2->get('descriptionformat')); + $this->assertNotEquals($tpl2->get('descriptionformat'), $plan3->get('descriptionformat')); + $this->assertNotEquals($tpl1->get('duedate'), $plan1->get('duedate')); + $this->assertNotEquals($tpl1->get('duedate'), $plan2->get('duedate')); + $this->assertNotEquals($tpl2->get('duedate'), $plan3->get('duedate')); // Update the template without changing critical fields does not update the plans. $data = $tpl1->to_record(); $data->visible = 0; api::update_template($data); - $this->assertNotEquals($tpl1->get_shortname(), $plan1->get_name()); - $this->assertNotEquals($tpl1->get_shortname(), $plan2->get_name()); - $this->assertNotEquals($tpl2->get_shortname(), $plan3->get_name()); - $this->assertNotEquals($tpl1->get_description(), $plan1->get_description()); - $this->assertNotEquals($tpl1->get_description(), $plan2->get_description()); - $this->assertNotEquals($tpl2->get_description(), $plan3->get_description()); - $this->assertNotEquals($tpl1->get_descriptionformat(), $plan1->get_descriptionformat()); - $this->assertNotEquals($tpl1->get_descriptionformat(), $plan2->get_descriptionformat()); - $this->assertNotEquals($tpl2->get_descriptionformat(), $plan3->get_descriptionformat()); - $this->assertNotEquals($tpl1->get_duedate(), $plan1->get_duedate()); - $this->assertNotEquals($tpl1->get_duedate(), $plan2->get_duedate()); - $this->assertNotEquals($tpl2->get_duedate(), $plan3->get_duedate()); + $this->assertNotEquals($tpl1->get('shortname'), $plan1->get('name')); + $this->assertNotEquals($tpl1->get('shortname'), $plan2->get('name')); + $this->assertNotEquals($tpl2->get('shortname'), $plan3->get('name')); + $this->assertNotEquals($tpl1->get('description'), $plan1->get('description')); + $this->assertNotEquals($tpl1->get('description'), $plan2->get('description')); + $this->assertNotEquals($tpl2->get('description'), $plan3->get('description')); + $this->assertNotEquals($tpl1->get('descriptionformat'), $plan1->get('descriptionformat')); + $this->assertNotEquals($tpl1->get('descriptionformat'), $plan2->get('descriptionformat')); + $this->assertNotEquals($tpl2->get('descriptionformat'), $plan3->get('descriptionformat')); + $this->assertNotEquals($tpl1->get('duedate'), $plan1->get('duedate')); + $this->assertNotEquals($tpl1->get('duedate'), $plan2->get('duedate')); + $this->assertNotEquals($tpl2->get('duedate'), $plan3->get('duedate')); // Now really update the template. $data = $tpl1->to_record(); @@ -736,22 +736,22 @@ class core_competency_api_testcase extends advanced_testcase { $plan2->read(); $plan3->read(); - $this->assertEquals($tpl1->get_id(), $plan1->get_templateid()); - $this->assertEquals($tpl1->get_id(), $plan2->get_templateid()); - $this->assertEquals($tpl2->get_id(), $plan3->get_templateid()); + $this->assertEquals($tpl1->get('id'), $plan1->get('templateid')); + $this->assertEquals($tpl1->get('id'), $plan2->get('templateid')); + $this->assertEquals($tpl2->get('id'), $plan3->get('templateid')); - $this->assertEquals($tpl1->get_shortname(), $plan1->get_name()); - $this->assertEquals($tpl1->get_shortname(), $plan2->get_name()); - $this->assertNotEquals($tpl2->get_shortname(), $plan3->get_name()); - $this->assertEquals($tpl1->get_description(), $plan1->get_description()); - $this->assertEquals($tpl1->get_description(), $plan2->get_description()); - $this->assertNotEquals($tpl2->get_description(), $plan3->get_description()); - $this->assertEquals($tpl1->get_descriptionformat(), $plan1->get_descriptionformat()); - $this->assertEquals($tpl1->get_descriptionformat(), $plan2->get_descriptionformat()); - $this->assertNotEquals($tpl2->get_descriptionformat(), $plan3->get_descriptionformat()); - $this->assertEquals($tpl1->get_duedate(), $plan1->get_duedate()); - $this->assertEquals($tpl1->get_duedate(), $plan2->get_duedate()); - $this->assertNotEquals($tpl2->get_duedate(), $plan3->get_duedate()); + $this->assertEquals($tpl1->get('shortname'), $plan1->get('name')); + $this->assertEquals($tpl1->get('shortname'), $plan2->get('name')); + $this->assertNotEquals($tpl2->get('shortname'), $plan3->get('name')); + $this->assertEquals($tpl1->get('description'), $plan1->get('description')); + $this->assertEquals($tpl1->get('description'), $plan2->get('description')); + $this->assertNotEquals($tpl2->get('description'), $plan3->get('description')); + $this->assertEquals($tpl1->get('descriptionformat'), $plan1->get('descriptionformat')); + $this->assertEquals($tpl1->get('descriptionformat'), $plan2->get('descriptionformat')); + $this->assertNotEquals($tpl2->get('descriptionformat'), $plan3->get('descriptionformat')); + $this->assertEquals($tpl1->get('duedate'), $plan1->get('duedate')); + $this->assertEquals($tpl1->get('duedate'), $plan2->get('duedate')); + $this->assertNotEquals($tpl2->get('duedate'), $plan3->get('duedate')); } /** @@ -770,24 +770,24 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create two plans and assign competencies. $plan = $lpg->create_plan(array('userid' => $user->id)); $otherplan = $lpg->create_plan(array('userid' => $user->id)); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c3->get_id())); - $lpg->create_plan_competency(array('planid' => $otherplan->get_id(), 'competencyid' => $c1->get_id())); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c3->get('id'))); + $lpg->create_plan_competency(array('planid' => $otherplan->get('id'), 'competencyid' => $c1->get('id'))); $uclist = array( - $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id(), + $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'), 'proficiency' => true, 'grade' => 1 )), - $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get_id(), + $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get('id'), 'proficiency' => false, 'grade' => 2 )) ); @@ -803,27 +803,27 @@ class core_competency_api_testcase extends advanced_testcase { $usercompetenciesplan = \core_competency\user_competency_plan::get_records(); - $this->assertEquals($uclist[0]->get_userid(), $usercompetenciesplan[0]->get_userid()); - $this->assertEquals($uclist[0]->get_competencyid(), $usercompetenciesplan[0]->get_competencyid()); - $this->assertEquals($uclist[0]->get_proficiency(), (bool) $usercompetenciesplan[0]->get_proficiency()); - $this->assertEquals($uclist[0]->get_grade(), $usercompetenciesplan[0]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[0]->get_planid()); + $this->assertEquals($uclist[0]->get('userid'), $usercompetenciesplan[0]->get('userid')); + $this->assertEquals($uclist[0]->get('competencyid'), $usercompetenciesplan[0]->get('competencyid')); + $this->assertEquals($uclist[0]->get('proficiency'), (bool) $usercompetenciesplan[0]->get('proficiency')); + $this->assertEquals($uclist[0]->get('grade'), $usercompetenciesplan[0]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[0]->get('planid')); - $this->assertEquals($uclist[1]->get_userid(), $usercompetenciesplan[1]->get_userid()); - $this->assertEquals($uclist[1]->get_competencyid(), $usercompetenciesplan[1]->get_competencyid()); - $this->assertEquals($uclist[1]->get_proficiency(), (bool) $usercompetenciesplan[1]->get_proficiency()); - $this->assertEquals($uclist[1]->get_grade(), $usercompetenciesplan[1]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[1]->get_planid()); + $this->assertEquals($uclist[1]->get('userid'), $usercompetenciesplan[1]->get('userid')); + $this->assertEquals($uclist[1]->get('competencyid'), $usercompetenciesplan[1]->get('competencyid')); + $this->assertEquals($uclist[1]->get('proficiency'), (bool) $usercompetenciesplan[1]->get('proficiency')); + $this->assertEquals($uclist[1]->get('grade'), $usercompetenciesplan[1]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[1]->get('planid')); - $this->assertEquals($user->id, $usercompetenciesplan[2]->get_userid()); - $this->assertEquals($c3->get_id(), $usercompetenciesplan[2]->get_competencyid()); - $this->assertNull($usercompetenciesplan[2]->get_proficiency()); - $this->assertNull($usercompetenciesplan[2]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[2]->get_planid()); + $this->assertEquals($user->id, $usercompetenciesplan[2]->get('userid')); + $this->assertEquals($c3->get('id'), $usercompetenciesplan[2]->get('competencyid')); + $this->assertNull($usercompetenciesplan[2]->get('proficiency')); + $this->assertNull($usercompetenciesplan[2]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[2]->get('planid')); // Check we can not add competency to completed plan. try { - api::add_competency_to_plan($plan->get_id(), $c4->get_id()); + api::add_competency_to_plan($plan->get('id'), $c4->get('id')); $this->fail('We can not add competency to completed plan.'); } catch (coding_exception $e) { // All good. @@ -831,7 +831,7 @@ class core_competency_api_testcase extends advanced_testcase { // Check we can not remove competency to completed plan. try { - api::remove_competency_from_plan($plan->get_id(), $c3->get_id()); + api::remove_competency_from_plan($plan->get('id'), $c3->get('id')); $this->fail('We can not remove competency to completed plan.'); } catch (coding_exception $e) { // All good. @@ -869,7 +869,7 @@ class core_competency_api_testcase extends advanced_testcase { $lpg = $dg->get_plugin_generator('core_competency'); $tpl = $lpg->create_template(); $plan = $lpg->create_plan(array('userid' => $user->id)); - $tplplan = $lpg->create_plan(array('userid' => $user->id, 'templateid' => $tpl->get_id())); + $tplplan = $lpg->create_plan(array('userid' => $user->id, 'templateid' => $tpl->get('id'))); return array( 'dg' => $dg, @@ -895,8 +895,8 @@ class core_competency_api_testcase extends advanced_testcase { $plan = $data['plan']; $tplplan = $data['tplplan']; - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); - $this->assertEquals(plan::STATUS_DRAFT, $tplplan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); + $this->assertEquals(plan::STATUS_DRAFT, $tplplan->get('status')); // Foreign user cannot do anything. $this->setUser($otheruser); @@ -918,7 +918,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not send for review when not draft. $this->setUser($user); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); try { api::plan_request_review($plan); $this->fail('The plan cannot be sent for review at this stage.'); @@ -928,7 +928,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not send for review when not draft. $this->setUser($user); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::plan_request_review($plan); $this->fail('The plan cannot be sent for review at this stage.'); @@ -938,7 +938,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not send for review when not draft. $this->setUser($user); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::plan_request_review($plan); $this->fail('The plan cannot be sent for review at this stage.'); @@ -948,7 +948,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not send for review when not draft. $this->setUser($user); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::plan_request_review($plan); $this->fail('The plan cannot be sent for review at this stage.'); @@ -958,7 +958,7 @@ class core_competency_api_testcase extends advanced_testcase { // Sending for review as a reviewer. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); try { api::plan_request_review($plan); $this->fail('The user can not request a review.'); @@ -970,14 +970,14 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($user); api::plan_request_review($plan); $plan->read(); - $this->assertEquals(plan::STATUS_WAITING_FOR_REVIEW, $plan->get_status()); + $this->assertEquals(plan::STATUS_WAITING_FOR_REVIEW, $plan->get('status')); // Sending for review by ID. - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); $plan->update(); - api::plan_request_review($plan->get_id()); + api::plan_request_review($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_WAITING_FOR_REVIEW, $plan->get_status()); + $this->assertEquals(plan::STATUS_WAITING_FOR_REVIEW, $plan->get('status')); } /** @@ -994,9 +994,9 @@ class core_competency_api_testcase extends advanced_testcase { $tplplan = $data['tplplan']; // Set waiting for review. - $tplplan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $tplplan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $tplplan->update(); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $plan->update(); // Foreign user cannot do anything. @@ -1019,7 +1019,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not cancel review request when not waiting for review. $this->setUser($user); - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); try { api::plan_cancel_review_request($plan); $this->fail('The plan cannot be sent for review at this stage.'); @@ -1029,7 +1029,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not cancel review request when not waiting for review. $this->setUser($user); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::plan_cancel_review_request($plan); $this->fail('The plan review cannot be cancelled at this stage.'); @@ -1039,7 +1039,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not cancel review request when not waiting for review. $this->setUser($user); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::plan_cancel_review_request($plan); $this->fail('The plan review cannot be cancelled at this stage.'); @@ -1049,7 +1049,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not cancel review request when not waiting for review. $this->setUser($user); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::plan_cancel_review_request($plan); $this->fail('The plan review cannot be cancelled at this stage.'); @@ -1059,7 +1059,7 @@ class core_competency_api_testcase extends advanced_testcase { // Cancelling as a reviewer. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); try { api::plan_cancel_review_request($plan); $this->fail('The user can not cancel a review request.'); @@ -1071,14 +1071,14 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($user); api::plan_cancel_review_request($plan); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); // Cancelling review request by ID. - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $plan->update(); - api::plan_cancel_review_request($plan->get_id()); + api::plan_cancel_review_request($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); } /** @@ -1095,9 +1095,9 @@ class core_competency_api_testcase extends advanced_testcase { $tplplan = $data['tplplan']; // Set waiting for review. - $tplplan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $tplplan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $tplplan->update(); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $plan->update(); // Foreign user cannot do anything. @@ -1120,7 +1120,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not start a review when not waiting for review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); try { api::plan_start_review($plan); $this->fail('The plan review cannot be started at this stage.'); @@ -1130,7 +1130,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not start a review when not waiting for review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::plan_start_review($plan); $this->fail('The plan review cannot be started at this stage.'); @@ -1140,7 +1140,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not start a review when not waiting for review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::plan_start_review($plan); $this->fail('The plan review cannot be started at this stage.'); @@ -1150,7 +1150,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not start a review when not waiting for review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::plan_start_review($plan); $this->fail('The plan review cannot be started at this stage.'); @@ -1160,7 +1160,7 @@ class core_competency_api_testcase extends advanced_testcase { // Starting as the owner. $this->setUser($user); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); try { api::plan_start_review($plan); $this->fail('The user can not start a review.'); @@ -1172,17 +1172,17 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($reviewer); api::plan_start_review($plan); $plan->read(); - $this->assertEquals(plan::STATUS_IN_REVIEW, $plan->get_status()); - $this->assertEquals($reviewer->id, $plan->get_reviewerid()); + $this->assertEquals(plan::STATUS_IN_REVIEW, $plan->get('status')); + $this->assertEquals($reviewer->id, $plan->get('reviewerid')); // Starting review by ID. - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); - $plan->set_reviewerid(null); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('reviewerid', null); $plan->update(); - api::plan_start_review($plan->get_id()); + api::plan_start_review($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_IN_REVIEW, $plan->get_status()); - $this->assertEquals($reviewer->id, $plan->get_reviewerid()); + $this->assertEquals(plan::STATUS_IN_REVIEW, $plan->get('status')); + $this->assertEquals($reviewer->id, $plan->get('reviewerid')); } /** @@ -1199,9 +1199,9 @@ class core_competency_api_testcase extends advanced_testcase { $tplplan = $data['tplplan']; // Set waiting for review. - $tplplan->set_status(plan::STATUS_IN_REVIEW); + $tplplan->set('status', plan::STATUS_IN_REVIEW); $tplplan->update(); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); $plan->update(); // Foreign user cannot do anything. @@ -1224,7 +1224,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not stop a review whe not in review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); try { api::plan_stop_review($plan); $this->fail('The plan review cannot be stopped at this stage.'); @@ -1234,7 +1234,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not stop a review whe not in review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); try { api::plan_stop_review($plan); $this->fail('The plan review cannot be stopped at this stage.'); @@ -1244,7 +1244,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not stop a review whe not in review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::plan_stop_review($plan); $this->fail('The plan review cannot be stopped at this stage.'); @@ -1254,7 +1254,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not stop a review whe not in review. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::plan_stop_review($plan); $this->fail('The plan review cannot be stopped at this stage.'); @@ -1264,7 +1264,7 @@ class core_competency_api_testcase extends advanced_testcase { // Stopping as the owner. $this->setUser($user); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::plan_stop_review($plan); $this->fail('The user can not stop a review.'); @@ -1276,14 +1276,14 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($reviewer); api::plan_stop_review($plan); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); // Stopping review by ID. - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); $plan->update(); - api::plan_stop_review($plan->get_id()); + api::plan_stop_review($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); } /** @@ -1300,9 +1300,9 @@ class core_competency_api_testcase extends advanced_testcase { $tplplan = $data['tplplan']; // Set waiting for review. - $tplplan->set_status(plan::STATUS_IN_REVIEW); + $tplplan->set('status', plan::STATUS_IN_REVIEW); $tplplan->update(); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); $plan->update(); // Foreign user cannot do anything. @@ -1325,7 +1325,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not approve a plan already approved. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::approve_plan($plan); $this->fail('The plan cannot be approved at this stage.'); @@ -1335,7 +1335,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not approve a plan already approved. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::approve_plan($plan); $this->fail('The plan cannot be approved at this stage.'); @@ -1345,7 +1345,7 @@ class core_competency_api_testcase extends advanced_testcase { // Approve as the owner. $this->setUser($user); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::approve_plan($plan); $this->fail('The user can not approve the plan.'); @@ -1357,28 +1357,28 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($reviewer); api::approve_plan($plan); $plan->read(); - $this->assertEquals(plan::STATUS_ACTIVE, $plan->get_status()); + $this->assertEquals(plan::STATUS_ACTIVE, $plan->get('status')); // Approve plan by ID. - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); $plan->update(); - api::approve_plan($plan->get_id()); + api::approve_plan($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_ACTIVE, $plan->get_status()); + $this->assertEquals(plan::STATUS_ACTIVE, $plan->get('status')); // Approve plan from draft. - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); $plan->update(); api::approve_plan($plan); $plan->read(); - $this->assertEquals(plan::STATUS_ACTIVE, $plan->get_status()); + $this->assertEquals(plan::STATUS_ACTIVE, $plan->get('status')); // Approve plan from waiting for review. - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); $plan->update(); api::approve_plan($plan); $plan->read(); - $this->assertEquals(plan::STATUS_ACTIVE, $plan->get_status()); + $this->assertEquals(plan::STATUS_ACTIVE, $plan->get('status')); } /** @@ -1395,9 +1395,9 @@ class core_competency_api_testcase extends advanced_testcase { $tplplan = $data['tplplan']; // Set waiting for review. - $tplplan->set_status(plan::STATUS_ACTIVE); + $tplplan->set('status', plan::STATUS_ACTIVE); $tplplan->update(); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); $plan->update(); // Foreign user cannot do anything. @@ -1420,7 +1420,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not unapprove a non-draft plan. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_DRAFT); + $plan->set('status', plan::STATUS_DRAFT); try { api::unapprove_plan($plan); $this->fail('The plan cannot be sent back to draft at this stage.'); @@ -1430,7 +1430,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not unapprove a non-draft plan. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_WAITING_FOR_REVIEW); + $plan->set('status', plan::STATUS_WAITING_FOR_REVIEW); try { api::unapprove_plan($plan); $this->fail('The plan cannot be sent back to draft at this stage.'); @@ -1440,7 +1440,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not unapprove a non-draft plan. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_IN_REVIEW); + $plan->set('status', plan::STATUS_IN_REVIEW); try { api::unapprove_plan($plan); $this->fail('The plan cannot be sent back to draft at this stage.'); @@ -1450,7 +1450,7 @@ class core_competency_api_testcase extends advanced_testcase { // Can not unapprove a non-draft plan. $this->setUser($reviewer); - $plan->set_status(plan::STATUS_COMPLETE); + $plan->set('status', plan::STATUS_COMPLETE); try { api::unapprove_plan($plan); $this->fail('The plan cannot be sent back to draft at this stage.'); @@ -1460,7 +1460,7 @@ class core_competency_api_testcase extends advanced_testcase { // Unapprove as the owner. $this->setUser($user); - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); try { api::unapprove_plan($plan); $this->fail('The user can not unapprove the plan.'); @@ -1472,14 +1472,14 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($reviewer); api::unapprove_plan($plan); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); // Unapprove plan by ID. - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); $plan->update(); - api::unapprove_plan($plan->get_id()); + api::unapprove_plan($plan->get('id')); $plan->read(); - $this->assertEquals(plan::STATUS_DRAFT, $plan->get_status()); + $this->assertEquals(plan::STATUS_DRAFT, $plan->get('status')); } /** @@ -1509,29 +1509,29 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create two plans and assign competencies. $plan = $lpg->create_plan(array('userid' => $user->id)); $otherplan = $lpg->create_plan(array('userid' => $user->id)); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c3->get_id())); - $lpg->create_plan_competency(array('planid' => $otherplan->get_id(), 'competencyid' => $c1->get_id())); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c3->get('id'))); + $lpg->create_plan_competency(array('planid' => $otherplan->get('id'), 'competencyid' => $c1->get('id'))); $uclist = array( $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c1->get_id(), + 'competencyid' => $c1->get('id'), 'proficiency' => true, 'grade' => 1 )), $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c2->get_id(), + 'competencyid' => $c2->get('id'), 'proficiency' => false, 'grade' => 2 )) @@ -1555,23 +1555,23 @@ class core_competency_api_testcase extends advanced_testcase { $usercompetenciesplan = \core_competency\user_competency_plan::get_records(); - $this->assertEquals($uclist[0]->get_userid(), $usercompetenciesplan[0]->get_userid()); - $this->assertEquals($uclist[0]->get_competencyid(), $usercompetenciesplan[0]->get_competencyid()); - $this->assertEquals($uclist[0]->get_proficiency(), (bool) $usercompetenciesplan[0]->get_proficiency()); - $this->assertEquals($uclist[0]->get_grade(), $usercompetenciesplan[0]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[0]->get_planid()); + $this->assertEquals($uclist[0]->get('userid'), $usercompetenciesplan[0]->get('userid')); + $this->assertEquals($uclist[0]->get('competencyid'), $usercompetenciesplan[0]->get('competencyid')); + $this->assertEquals($uclist[0]->get('proficiency'), (bool) $usercompetenciesplan[0]->get('proficiency')); + $this->assertEquals($uclist[0]->get('grade'), $usercompetenciesplan[0]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[0]->get('planid')); - $this->assertEquals($uclist[1]->get_userid(), $usercompetenciesplan[1]->get_userid()); - $this->assertEquals($uclist[1]->get_competencyid(), $usercompetenciesplan[1]->get_competencyid()); - $this->assertEquals($uclist[1]->get_proficiency(), (bool) $usercompetenciesplan[1]->get_proficiency()); - $this->assertEquals($uclist[1]->get_grade(), $usercompetenciesplan[1]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[1]->get_planid()); + $this->assertEquals($uclist[1]->get('userid'), $usercompetenciesplan[1]->get('userid')); + $this->assertEquals($uclist[1]->get('competencyid'), $usercompetenciesplan[1]->get('competencyid')); + $this->assertEquals($uclist[1]->get('proficiency'), (bool) $usercompetenciesplan[1]->get('proficiency')); + $this->assertEquals($uclist[1]->get('grade'), $usercompetenciesplan[1]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[1]->get('planid')); - $this->assertEquals($user->id, $usercompetenciesplan[2]->get_userid()); - $this->assertEquals($c3->get_id(), $usercompetenciesplan[2]->get_competencyid()); - $this->assertNull($usercompetenciesplan[2]->get_proficiency()); - $this->assertNull($usercompetenciesplan[2]->get_grade()); - $this->assertEquals($plan->get_id(), $usercompetenciesplan[2]->get_planid()); + $this->assertEquals($user->id, $usercompetenciesplan[2]->get('userid')); + $this->assertEquals($c3->get('id'), $usercompetenciesplan[2]->get('competencyid')); + $this->assertNull($usercompetenciesplan[2]->get('proficiency')); + $this->assertNull($usercompetenciesplan[2]->get('grade')); + $this->assertEquals($plan->get('id'), $usercompetenciesplan[2]->get('planid')); // Change status of the plan to active. $record = $plan->to_record(); @@ -1608,24 +1608,24 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create two plans and assign competencies. $plan = $lpg->create_plan(array('userid' => $user->id)); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c3->get_id())); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c3->get('id'))); // Changing competencies order in plan competency. - api::reorder_plan_competency($plan->get_id(), $c1->get_id(), $c3->get_id()); + api::reorder_plan_competency($plan->get('id'), $c1->get('id'), $c3->get('id')); $competencies = api::list_plan_competencies($plan); - $this->assertEquals($c2->get_id(), $competencies[0]->competency->get_id()); - $this->assertEquals($c3->get_id(), $competencies[1]->competency->get_id()); - $this->assertEquals($c1->get_id(), $competencies[2]->competency->get_id()); + $this->assertEquals($c2->get('id'), $competencies[0]->competency->get('id')); + $this->assertEquals($c3->get('id'), $competencies[1]->competency->get('id')); + $this->assertEquals($c1->get('id'), $competencies[2]->competency->get('id')); // Completing plan. api::complete_plan($plan); @@ -1633,41 +1633,41 @@ class core_competency_api_testcase extends advanced_testcase { $competencies = api::list_plan_competencies($plan); // Completing plan does not change order. - $this->assertEquals($c2->get_id(), $competencies[0]->competency->get_id()); - $this->assertEquals($c3->get_id(), $competencies[1]->competency->get_id()); - $this->assertEquals($c1->get_id(), $competencies[2]->competency->get_id()); + $this->assertEquals($c2->get('id'), $competencies[0]->competency->get('id')); + $this->assertEquals($c3->get('id'), $competencies[1]->competency->get('id')); + $this->assertEquals($c1->get('id'), $competencies[2]->competency->get('id')); // Testing plan based on template. $template = $lpg->create_template(); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $c1->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $c1->get('id') )); $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $c2->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $c2->get('id') )); $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $c3->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $c3->get('id') )); // Reorder competencies in template. - api::reorder_template_competency($template->get_id(), $c1->get_id(), $c3->get_id()); + api::reorder_template_competency($template->get('id'), $c1->get('id'), $c3->get('id')); // Create plan from template. - $plan = api::create_plan_from_template($template->get_id(), $user->id); + $plan = api::create_plan_from_template($template->get('id'), $user->id); $competencies = api::list_plan_competencies($plan); // Completing plan does not change order. - $this->assertEquals($c2->get_id(), $competencies[0]->competency->get_id()); - $this->assertEquals($c3->get_id(), $competencies[1]->competency->get_id()); - $this->assertEquals($c1->get_id(), $competencies[2]->competency->get_id()); + $this->assertEquals($c2->get('id'), $competencies[0]->competency->get('id')); + $this->assertEquals($c3->get('id'), $competencies[1]->competency->get('id')); + $this->assertEquals($c1->get('id'), $competencies[2]->competency->get('id')); // Completing plan. api::complete_plan($plan); @@ -1675,9 +1675,9 @@ class core_competency_api_testcase extends advanced_testcase { $competencies = api::list_plan_competencies($plan); // Completing plan does not change order. - $this->assertEquals($c2->get_id(), $competencies[0]->competency->get_id()); - $this->assertEquals($c3->get_id(), $competencies[1]->competency->get_id()); - $this->assertEquals($c1->get_id(), $competencies[2]->competency->get_id()); + $this->assertEquals($c2->get('id'), $competencies[0]->competency->get('id')); + $this->assertEquals($c3->get('id'), $competencies[1]->competency->get('id')); + $this->assertEquals($c1->get('id'), $competencies[2]->competency->get('id')); } /** @@ -1703,25 +1703,25 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create completed plan with records in user_competency. $completedplan = $lpg->create_plan(array('userid' => $user->id, 'status' => \core_competency\plan::STATUS_COMPLETE)); - $lpg->create_plan_competency(array('planid' => $completedplan->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $completedplan->get_id(), 'competencyid' => $c2->get_id())); + $lpg->create_plan_competency(array('planid' => $completedplan->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $completedplan->get('id'), 'competencyid' => $c2->get('id'))); - $uc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $uc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get_id())); + $uc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $uc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get('id'))); - $ucp1 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c1->get_id(), - 'planid' => $completedplan->get_id())); - $ucp2 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c2->get_id(), - 'planid' => $completedplan->get_id())); + $ucp1 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c1->get('id'), + 'planid' => $completedplan->get('id'))); + $ucp2 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c2->get('id'), + 'planid' => $completedplan->get('id'))); - api::delete_plan($completedplan->get_id()); + api::delete_plan($completedplan->get('id')); // Check that achived user competencies are deleted. $this->assertEquals(0, \core_competency\plan::count_records()); @@ -1752,62 +1752,62 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create draft plan with records in user_competency. $draftplan = $lpg->create_plan(array('userid' => $user->id)); - $lpg->create_plan_competency(array('planid' => $draftplan->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $draftplan->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_plan_competency(array('planid' => $draftplan->get_id(), 'competencyid' => $c3->get_id())); + $lpg->create_plan_competency(array('planid' => $draftplan->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $draftplan->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_plan_competency(array('planid' => $draftplan->get('id'), 'competencyid' => $c3->get('id'))); - $uc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $uc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get_id())); + $uc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $uc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get('id'))); // Check that user_competency objects are returned when plan status is not complete. $plancompetencies = api::list_plan_competencies($draftplan); $this->assertCount(3, $plancompetencies); $this->assertInstanceOf('\core_competency\user_competency', $plancompetencies[0]->usercompetency); - $this->assertEquals($uc1->get_id(), $plancompetencies[0]->usercompetency->get_id()); + $this->assertEquals($uc1->get('id'), $plancompetencies[0]->usercompetency->get('id')); $this->assertNull($plancompetencies[0]->usercompetencyplan); $this->assertInstanceOf('\core_competency\user_competency', $plancompetencies[1]->usercompetency); - $this->assertEquals($uc2->get_id(), $plancompetencies[1]->usercompetency->get_id()); + $this->assertEquals($uc2->get('id'), $plancompetencies[1]->usercompetency->get('id')); $this->assertNull($plancompetencies[1]->usercompetencyplan); $this->assertInstanceOf('\core_competency\user_competency', $plancompetencies[2]->usercompetency); - $this->assertEquals(0, $plancompetencies[2]->usercompetency->get_id()); + $this->assertEquals(0, $plancompetencies[2]->usercompetency->get('id')); $this->assertNull($plancompetencies[2]->usercompetencyplan); // Create completed plan with records in user_competency_plan. $completedplan = $lpg->create_plan(array('userid' => $user->id, 'status' => \core_competency\plan::STATUS_COMPLETE)); - $pc1 = $lpg->create_plan_competency(array('planid' => $completedplan->get_id(), 'competencyid' => $c1->get_id())); - $pc2 = $lpg->create_plan_competency(array('planid' => $completedplan->get_id(), 'competencyid' => $c2->get_id())); - $pc3 = $lpg->create_plan_competency(array('planid' => $completedplan->get_id(), 'competencyid' => $c3->get_id())); + $pc1 = $lpg->create_plan_competency(array('planid' => $completedplan->get('id'), 'competencyid' => $c1->get('id'))); + $pc2 = $lpg->create_plan_competency(array('planid' => $completedplan->get('id'), 'competencyid' => $c2->get('id'))); + $pc3 = $lpg->create_plan_competency(array('planid' => $completedplan->get('id'), 'competencyid' => $c3->get('id'))); - $ucp1 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c1->get_id(), - 'planid' => $completedplan->get_id())); - $ucp2 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c2->get_id(), - 'planid' => $completedplan->get_id())); - $ucp3 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c3->get_id(), - 'planid' => $completedplan->get_id())); + $ucp1 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c1->get('id'), + 'planid' => $completedplan->get('id'))); + $ucp2 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c2->get('id'), + 'planid' => $completedplan->get('id'))); + $ucp3 = $lpg->create_user_competency_plan(array('userid' => $user->id, 'competencyid' => $c3->get('id'), + 'planid' => $completedplan->get('id'))); // Check that user_competency_plan objects are returned when plan status is complete. $plancompetencies = api::list_plan_competencies($completedplan); $this->assertCount(3, $plancompetencies); $this->assertInstanceOf('\core_competency\user_competency_plan', $plancompetencies[0]->usercompetencyplan); - $this->assertEquals($ucp1->get_id(), $plancompetencies[0]->usercompetencyplan->get_id()); + $this->assertEquals($ucp1->get('id'), $plancompetencies[0]->usercompetencyplan->get('id')); $this->assertNull($plancompetencies[0]->usercompetency); $this->assertInstanceOf('\core_competency\user_competency_plan', $plancompetencies[1]->usercompetencyplan); - $this->assertEquals($ucp2->get_id(), $plancompetencies[1]->usercompetencyplan->get_id()); + $this->assertEquals($ucp2->get('id'), $plancompetencies[1]->usercompetencyplan->get('id')); $this->assertNull($plancompetencies[1]->usercompetency); $this->assertInstanceOf('\core_competency\user_competency_plan', $plancompetencies[2]->usercompetencyplan); - $this->assertEquals($ucp3->get_id(), $plancompetencies[2]->usercompetencyplan->get_id()); + $this->assertEquals($ucp3->get('id'), $plancompetencies[2]->usercompetencyplan->get('id')); $this->assertNull($plancompetencies[2]->usercompetency); } @@ -1826,17 +1826,17 @@ class core_competency_api_testcase extends advanced_testcase { $this->assertEquals(0, \core_competency\template_cohort::count_records()); // Create two relations with mixed parameters. - $result = api::create_template_cohort($t1->get_id(), $c1->id); + $result = api::create_template_cohort($t1->get('id'), $c1->id); $result = api::create_template_cohort($t1, $c2); $this->assertEquals(2, \core_competency\template_cohort::count_records()); $this->assertInstanceOf('core_competency\template_cohort', $result); - $this->assertEquals($c2->id, $result->get_cohortid()); - $this->assertEquals($t1->get_id(), $result->get_templateid()); + $this->assertEquals($c2->id, $result->get('cohortid')); + $this->assertEquals($t1->get('id'), $result->get('templateid')); $this->assertEquals(2, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t1->get_id()))); + array('id' => $t1->get('id')))); $this->assertEquals(0, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t2->get_id()))); + array('id' => $t2->get('id')))); } public function test_create_template_cohort_permissions() { @@ -1904,27 +1904,27 @@ class core_competency_api_testcase extends advanced_testcase { $framework = $lpg->create_framework(array('contextid' => $catcontext->id)); // Create competencies. - $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Add the competencies. $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $competency1->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $competency1->get('id') )); $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $competency2->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $competency2->get('id') )); $this->setUser($user); // Can reorder competencies with system context permissions in category context. - $result = api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id()); + $result = api::reorder_template_competency($template->get('id'), $competency2->get('id'), $competency1->get('id')); $this->assertTrue($result); unassign_capability('moodle/competency:templatemanage', $role, $syscontext->id); accesslib_clear_all_caches_for_unit_testing(); try { - api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id()); + api::reorder_template_competency($template->get('id'), $competency2->get('id'), $competency1->get('id')); $this->fail('Exception expected due to not permissions to manage template competencies'); } catch (required_capability_exception $e) { $this->assertEquals('nopermissions', $e->errorcode); @@ -1934,14 +1934,14 @@ class core_competency_api_testcase extends advanced_testcase { assign_capability('moodle/competency:templatemanage', CAP_ALLOW, $role, $catcontext->id, true); $dg->role_assign($role, $user->id, $catcontext->id); // User with templatemanage capability in category context can reorder competencies in temple. - $result = api::reorder_template_competency($template->get_id(), $competency1->get_id(), $competency2->get_id()); + $result = api::reorder_template_competency($template->get('id'), $competency1->get('id'), $competency2->get('id')); $this->assertTrue($result); // Removing templatemanage capability in category context. unassign_capability('moodle/competency:templatemanage', $role, $catcontext->id); accesslib_clear_all_caches_for_unit_testing(); try { - api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id()); + api::reorder_template_competency($template->get('id'), $competency2->get('id'), $competency1->get('id')); $this->fail('Exception expected due to not permissions to manage template competencies'); } catch (required_capability_exception $e) { $this->assertEquals('nopermissions', $e->errorcode); @@ -1958,17 +1958,17 @@ class core_competency_api_testcase extends advanced_testcase { $c1 = $dg->create_cohort(); $c2 = $dg->create_cohort(); $template = $lpg->create_template(); - $id = $template->get_id(); + $id = $template->get('id'); // Create 2 template cohorts. - $tc1 = $lpg->create_template_cohort(array('templateid' => $template->get_id(), 'cohortid' => $c1->id)); - $tc1 = $lpg->create_template_cohort(array('templateid' => $template->get_id(), 'cohortid' => $c2->id)); + $tc1 = $lpg->create_template_cohort(array('templateid' => $template->get('id'), 'cohortid' => $c1->id)); + $tc1 = $lpg->create_template_cohort(array('templateid' => $template->get('id'), 'cohortid' => $c2->id)); // Check pre-test. $this->assertTrue(\core_competency\template::record_exists($id)); $this->assertEquals(2, \core_competency\template_cohort::count_records(array('templateid' => $id))); - $result = api::delete_template($template->get_id()); + $result = api::delete_template($template->get('id')); $this->assertTrue($result); // Check that the template deos not exist anymore. @@ -1989,32 +1989,32 @@ class core_competency_api_testcase extends advanced_testcase { $c2 = $dg->create_cohort(); $t1 = $lpg->create_template(); $t2 = $lpg->create_template(); - $tc1 = $lpg->create_template_cohort(array('templateid' => $t1->get_id(), 'cohortid' => $c1->id)); - $tc1 = $lpg->create_template_cohort(array('templateid' => $t2->get_id(), 'cohortid' => $c2->id)); + $tc1 = $lpg->create_template_cohort(array('templateid' => $t1->get('id'), 'cohortid' => $c1->id)); + $tc1 = $lpg->create_template_cohort(array('templateid' => $t2->get('id'), 'cohortid' => $c2->id)); $this->assertEquals(2, \core_competency\template_cohort::count_records()); $this->assertEquals(1, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t1->get_id()))); + array('id' => $t1->get('id')))); $this->assertEquals(1, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t2->get_id()))); + array('id' => $t2->get('id')))); // Delete existing. - $result = api::delete_template_cohort($t1->get_id(), $c1->id); + $result = api::delete_template_cohort($t1->get('id'), $c1->id); $this->assertTrue($result); $this->assertEquals(1, \core_competency\template_cohort::count_records()); $this->assertEquals(0, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t1->get_id()))); + array('id' => $t1->get('id')))); $this->assertEquals(1, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t2->get_id()))); + array('id' => $t2->get('id')))); // Delete non-existant. - $result = api::delete_template_cohort($t1->get_id(), $c1->id); + $result = api::delete_template_cohort($t1->get('id'), $c1->id); $this->assertTrue($result); $this->assertEquals(1, \core_competency\template_cohort::count_records()); $this->assertEquals(0, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t1->get_id()))); + array('id' => $t1->get('id')))); $this->assertEquals(1, \core_competency\template_cohort::count_records_select('templateid = :id', - array('id' => $t2->get_id()))); + array('id' => $t2->get('id')))); } public function test_add_evidence_log() { @@ -2025,56 +2025,56 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $u1ctx = context_user::instance($u1->id); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Creating a standard evidence with minimal information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error'); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertSame(null, $uc->get_grade()); - $this->assertSame(null, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_LOG, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertSame(null, $evidence->get_grade()); - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertSame(null, $uc->get('grade')); + $this->assertSame(null, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_LOG, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertSame(null, $evidence->get('grade')); + $this->assertSame(null, $evidence->get('actionuserid')); // Creating a standard evidence with more information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', '$a', false, 'http://moodle.org', null, 2, 'The evidence of prior learning were reviewed.'); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertSame(null, $uc->get_grade()); - $this->assertSame(null, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_LOG, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertEquals('$a', $evidence->get_desca()); - $this->assertEquals('http://moodle.org', $evidence->get_url()); - $this->assertSame(null, $evidence->get_grade()); - $this->assertEquals(2, $evidence->get_actionuserid()); - $this->assertSame('The evidence of prior learning were reviewed.', $evidence->get_note()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertSame(null, $uc->get('grade')); + $this->assertSame(null, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_LOG, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertEquals('$a', $evidence->get('desca')); + $this->assertEquals('http://moodle.org', $evidence->get('url')); + $this->assertSame(null, $evidence->get('grade')); + $this->assertEquals(2, $evidence->get('actionuserid')); + $this->assertSame('The evidence of prior learning were reviewed.', $evidence->get('note')); // Creating a standard evidence and send for review. - $evidence = api::add_evidence($u1->id, $c2->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c2->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', null, true); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get_status()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get('status')); // Trying to pass a grade should fail. try { - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', null, false, null, 1); $this->fail('A grade can not be set'); } catch (coding_exception $e) { @@ -2099,79 +2099,79 @@ class core_competency_api_testcase extends advanced_testcase { $c2scaleconfig[] = array('name' => 'C', 'id' => 3, 'scaledefault' => 0, 'proficient' => 0); $c2scaleconfig[] = array('name' => 'D', 'id' => 4, 'scaledefault' => 1, 'proficient' => 1); $f1 = $lpg->create_framework(array('scaleid' => $scale->id, 'scaleconfiguration' => $scaleconfig)); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'scaleid' => $scale->id, + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'scaleid' => $scale->id, 'scaleconfiguration' => $c2scaleconfig)); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Creating an evidence with minimal information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', 'error'); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertEquals(2, $uc->get_grade()); // The grade has been set automatically to the framework default. - $this->assertEquals(0, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertEquals(2, $evidence->get_grade()); - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertEquals(2, $uc->get('grade')); // The grade has been set automatically to the framework default. + $this->assertEquals(0, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertEquals(2, $evidence->get('grade')); + $this->assertSame(null, $evidence->get('actionuserid')); // Creating an evidence complete on competency with custom scale. - $evidence = api::add_evidence($u1->id, $c2->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c2->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', 'error'); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertEquals(4, $uc->get_grade()); // The grade has been set automatically to the competency default. - $this->assertEquals(true, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertEquals(4, $evidence->get_grade()); - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertEquals(4, $uc->get('grade')); // The grade has been set automatically to the competency default. + $this->assertEquals(true, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertEquals(4, $evidence->get('grade')); + $this->assertSame(null, $evidence->get('actionuserid')); // Creating an evidence complete on a user competency with an existing grade. - $uc = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get_id(), 'grade' => 1, + $uc = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get('id'), 'grade' => 1, 'proficiency' => 0)); - $this->assertEquals(1, $uc->get_grade()); - $this->assertEquals(0, $uc->get_proficiency()); - $evidence = api::add_evidence($u1->id, $c3->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', + $this->assertEquals(1, $uc->get('grade')); + $this->assertEquals(0, $uc->get('proficiency')); + $evidence = api::add_evidence($u1->id, $c3->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', 'error'); $evidence->read(); $uc->read(); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertEquals(1, $uc->get_grade()); // The grade has not been changed. - $this->assertEquals(0, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertEquals(2, $evidence->get_grade()); // The complete grade has been set. - $this->assertSame(null, $evidence->get_actionuserid()); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertEquals(1, $uc->get('grade')); // The grade has not been changed. + $this->assertEquals(0, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertEquals(2, $evidence->get('grade')); // The complete grade has been set. + $this->assertSame(null, $evidence->get('actionuserid')); // Creating a standard evidence and send for review. - $evidence = api::add_evidence($u1->id, $c2->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c2->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', 'error', null, true); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get_status()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get('status')); // Trying to pass a grade should throw an exception. try { - api::add_evidence($u1->id, $c2->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', + api::add_evidence($u1->id, $c2->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_COMPLETE, 'invaliddata', 'error', null, false, null, 1); } catch (coding_exception $e) { $this->assertRegExp('/grade MUST NOT be set/', $e->getMessage()); @@ -2186,71 +2186,71 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $u1ctx = context_user::instance($u1->id); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Creating an evidence with minimal information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', 'error'); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertSame(null, $uc->get_grade()); // We overrode with 'null'. - $this->assertSame(null, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertSame(null, $evidence->get_grade()); // We overrode with 'null'. - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertSame(null, $uc->get('grade')); // We overrode with 'null'. + $this->assertSame(null, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertSame(null, $evidence->get('grade')); // We overrode with 'null'. + $this->assertSame(null, $evidence->get('actionuserid')); // Creating an evidence with a grade information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', 'error', null, false, null, 3); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertEquals(3, $uc->get_grade()); - $this->assertEquals(true, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertEquals(3, $evidence->get_grade()); - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertEquals(3, $uc->get('grade')); + $this->assertEquals(true, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertEquals(3, $evidence->get('grade')); + $this->assertSame(null, $evidence->get('actionuserid')); // Creating an evidence with another grade information. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', 'error', null, false, null, 1); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get_status()); - $this->assertEquals(1, $uc->get_grade()); - $this->assertEquals(0, $uc->get_proficiency()); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals($u1ctx->id, $evidence->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get_action()); - $this->assertEquals('invaliddata', $evidence->get_descidentifier()); - $this->assertEquals('error', $evidence->get_desccomponent()); - $this->assertSame(null, $evidence->get_desca()); - $this->assertSame(null, $evidence->get_url()); - $this->assertEquals(1, $evidence->get_grade()); - $this->assertSame(null, $evidence->get_actionuserid()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc->get('status')); + $this->assertEquals(1, $uc->get('grade')); + $this->assertEquals(0, $uc->get('proficiency')); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals($u1ctx->id, $evidence->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get('action')); + $this->assertEquals('invaliddata', $evidence->get('descidentifier')); + $this->assertEquals('error', $evidence->get('desccomponent')); + $this->assertSame(null, $evidence->get('desca')); + $this->assertSame(null, $evidence->get('url')); + $this->assertEquals(1, $evidence->get('grade')); + $this->assertSame(null, $evidence->get('actionuserid')); // Creating reverting the grade and send for review. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_OVERRIDE, 'invaliddata', 'error', null, true); $evidence->read(); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertSame(null, $uc->get_grade()); - $this->assertSame(null, $uc->get_proficiency()); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get_status()); - $this->assertSame(null, $evidence->get_grade()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertSame(null, $uc->get('grade')); + $this->assertSame(null, $uc->get('proficiency')); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get('status')); + $this->assertSame(null, $evidence->get('grade')); } public function test_add_evidence_and_send_for_review() { @@ -2261,27 +2261,27 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $u1ctx = context_user::instance($u1->id); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Non-existing user competencies are created up for review. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', null, true); - $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get_status()); + $uc = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get('status')); // Existing user competencies sent for review don't change. - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', null, true); $uc->read(); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get_status()); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc->get('status')); // A user competency with a status non-idle won't change. - $uc->set_status(\core_competency\user_competency::STATUS_IN_REVIEW); + $uc->set('status', \core_competency\user_competency::STATUS_IN_REVIEW); $uc->update(); - $evidence = api::add_evidence($u1->id, $c1->get_id(), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', + $evidence = api::add_evidence($u1->id, $c1->get('id'), $u1ctx->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error', null, true); $uc->read(); - $this->assertEquals(\core_competency\user_competency::STATUS_IN_REVIEW, $uc->get_status()); + $this->assertEquals(\core_competency\user_competency::STATUS_IN_REVIEW, $uc->get('status')); } /** @@ -2300,30 +2300,30 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $this->assertSame(null, $uc->get_grade()); - $this->assertSame(null, $uc->get_proficiency()); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $this->assertSame(null, $uc->get('grade')); + $this->assertSame(null, $uc->get('proficiency')); // Create an evidence and check it was created with the right usercomptencyid and information. - $evidence = api::add_evidence($user->id, $c1->get_id(), $syscontext->id, \core_competency\evidence::ACTION_OVERRIDE, + $evidence = api::add_evidence($user->id, $c1->get('id'), $syscontext->id, \core_competency\evidence::ACTION_OVERRIDE, 'invalidevidencedesc', 'core_competency', array('a' => 'b'), false, 'http://moodle.org', 1, 2); $this->assertEquals(1, \core_competency\evidence::count_records()); $evidence->read(); $uc->read(); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals('invalidevidencedesc', $evidence->get_descidentifier()); - $this->assertEquals('core_competency', $evidence->get_desccomponent()); - $this->assertEquals((object) array('a' => 'b'), $evidence->get_desca()); - $this->assertEquals('http://moodle.org', $evidence->get_url()); - $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get_action()); - $this->assertEquals(2, $evidence->get_actionuserid()); - $this->assertEquals(1, $evidence->get_grade()); - $this->assertEquals(1, $uc->get_grade()); - $this->assertEquals(0, $uc->get_proficiency()); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals('invalidevidencedesc', $evidence->get('descidentifier')); + $this->assertEquals('core_competency', $evidence->get('desccomponent')); + $this->assertEquals((object) array('a' => 'b'), $evidence->get('desca')); + $this->assertEquals('http://moodle.org', $evidence->get('url')); + $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get('action')); + $this->assertEquals(2, $evidence->get('actionuserid')); + $this->assertEquals(1, $evidence->get('grade')); + $this->assertEquals(1, $uc->get('grade')); + $this->assertEquals(0, $uc->get('proficiency')); } /** @@ -2342,28 +2342,28 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(0, \core_competency\user_competency::count_records()); // Create an evidence without a user competency record. - $evidence = api::add_evidence($user->id, $c1->get_id(), $syscontext->id, \core_competency\evidence::ACTION_OVERRIDE, + $evidence = api::add_evidence($user->id, $c1->get('id'), $syscontext->id, \core_competency\evidence::ACTION_OVERRIDE, 'invalidevidencedesc', 'core_competency', 'Hello world!', false, 'http://moodle.org', 1, 2); $this->assertEquals(1, \core_competency\evidence::count_records()); $this->assertEquals(1, \core_competency\user_competency::count_records()); - $uc = \core_competency\user_competency::get_record(array('userid' => $user->id, 'competencyid' => $c1->get_id())); + $uc = \core_competency\user_competency::get_record(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); $evidence->read(); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); - $this->assertEquals('invalidevidencedesc', $evidence->get_descidentifier()); - $this->assertEquals('core_competency', $evidence->get_desccomponent()); - $this->assertEquals('Hello world!', $evidence->get_desca()); - $this->assertEquals('http://moodle.org', $evidence->get_url()); - $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get_action()); - $this->assertEquals(2, $evidence->get_actionuserid()); - $this->assertEquals(1, $evidence->get_grade()); - $this->assertEquals(1, $uc->get_grade()); - $this->assertEquals(0, $uc->get_proficiency()); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); + $this->assertEquals('invalidevidencedesc', $evidence->get('descidentifier')); + $this->assertEquals('core_competency', $evidence->get('desccomponent')); + $this->assertEquals('Hello world!', $evidence->get('desca')); + $this->assertEquals('http://moodle.org', $evidence->get('url')); + $this->assertEquals(\core_competency\evidence::ACTION_OVERRIDE, $evidence->get('action')); + $this->assertEquals(2, $evidence->get('actionuserid')); + $this->assertEquals(1, $evidence->get('grade')); + $this->assertEquals(1, $uc->get('grade')); + $this->assertEquals(0, $uc->get('proficiency')); } public function test_add_evidence_applies_competency_rules() { @@ -2377,29 +2377,29 @@ class core_competency_api_testcase extends advanced_testcase { // Setting up the framework. $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c2->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c3a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c3->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c4a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c4->get_id())); - $c5 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c2->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c3a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c3->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c4a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c4->get('id'))); + $c5 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Setting up the rules. - $c1->set_ruletype('core_competency\\competency_rule_all'); - $c1->set_ruleoutcome(\core_competency\competency::OUTCOME_COMPLETE); + $c1->set('ruletype', 'core_competency\\competency_rule_all'); + $c1->set('ruleoutcome', \core_competency\competency::OUTCOME_COMPLETE); $c1->update(); - $c2->set_ruletype('core_competency\\competency_rule_all'); - $c2->set_ruleoutcome(\core_competency\competency::OUTCOME_RECOMMEND); + $c2->set('ruletype', 'core_competency\\competency_rule_all'); + $c2->set('ruleoutcome', \core_competency\competency::OUTCOME_RECOMMEND); $c2->update(); - $c3->set_ruletype('core_competency\\competency_rule_all'); - $c3->set_ruleoutcome(\core_competency\competency::OUTCOME_EVIDENCE); + $c3->set('ruletype', 'core_competency\\competency_rule_all'); + $c3->set('ruleoutcome', \core_competency\competency::OUTCOME_EVIDENCE); $c3->update(); - $c4->set_ruletype('core_competency\\competency_rule_all'); - $c4->set_ruleoutcome(\core_competency\competency::OUTCOME_NONE); + $c4->set('ruletype', 'core_competency\\competency_rule_all'); + $c4->set('ruleoutcome', \core_competency\competency::OUTCOME_NONE); $c4->update(); // Confirm the current data. @@ -2409,52 +2409,52 @@ class core_competency_api_testcase extends advanced_testcase { // Let's do this! // First let's confirm that evidence not marking a completion have no impact. api::add_evidence($u1->id, $c1a, $ctxid, evidence::ACTION_LOG, 'commentincontext', 'core'); - $uc1a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1a->get_id())); - $this->assertSame(null, $uc1a->get_proficiency()); - $this->assertFalse(user_competency::record_exists_select('userid = ? AND competencyid = ?', array($u1->id, $c1->get_id()))); + $uc1a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1a->get('id'))); + $this->assertSame(null, $uc1a->get('proficiency')); + $this->assertFalse(user_competency::record_exists_select('userid = ? AND competencyid = ?', array($u1->id, $c1->get('id')))); // Now let's try complete a competency but the rule won't match (not all children are complete). // The parent (the thing with the rule) will be created but won't have any evidence attached, and not // not be marked as completed. api::add_evidence($u1->id, $c1a, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); - $uc1a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1a->get_id())); - $this->assertEquals(true, $uc1a->get_proficiency()); - $uc1 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertSame(null, $uc1->get_proficiency()); - $this->assertEquals(0, evidence::count_records(array('usercompetencyid' => $uc1->get_id()))); + $uc1a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1a->get('id'))); + $this->assertEquals(true, $uc1a->get('proficiency')); + $uc1 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertSame(null, $uc1->get('proficiency')); + $this->assertEquals(0, evidence::count_records(array('usercompetencyid' => $uc1->get('id')))); // Now we complete the other child. That will mark the parent as complete with an evidence. api::add_evidence($u1->id, $c1b, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); - $uc1b = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1b->get_id())); - $this->assertEquals(true, $uc1a->get_proficiency()); - $uc1 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $this->assertEquals(true, $uc1->get_proficiency()); - $this->assertEquals(user_competency::STATUS_IDLE, $uc1->get_status()); - $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc1->get_id()))); + $uc1b = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1b->get('id'))); + $this->assertEquals(true, $uc1a->get('proficiency')); + $uc1 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $this->assertEquals(true, $uc1->get('proficiency')); + $this->assertEquals(user_competency::STATUS_IDLE, $uc1->get('status')); + $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc1->get('id')))); // Check rule recommending. api::add_evidence($u1->id, $c2a, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); - $uc2a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2a->get_id())); - $this->assertEquals(true, $uc1a->get_proficiency()); - $uc2 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $this->assertSame(null, $uc2->get_proficiency()); - $this->assertEquals(user_competency::STATUS_WAITING_FOR_REVIEW, $uc2->get_status()); - $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc2->get_id()))); + $uc2a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2a->get('id'))); + $this->assertEquals(true, $uc1a->get('proficiency')); + $uc2 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $this->assertSame(null, $uc2->get('proficiency')); + $this->assertEquals(user_competency::STATUS_WAITING_FOR_REVIEW, $uc2->get('status')); + $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc2->get('id')))); // Check rule evidence. api::add_evidence($u1->id, $c3a, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); - $uc3a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3a->get_id())); - $this->assertEquals(true, $uc1a->get_proficiency()); - $uc3 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3->get_id())); - $this->assertSame(null, $uc3->get_proficiency()); - $this->assertEquals(user_competency::STATUS_IDLE, $uc3->get_status()); - $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc3->get_id()))); + $uc3a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3a->get('id'))); + $this->assertEquals(true, $uc1a->get('proficiency')); + $uc3 = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3->get('id'))); + $this->assertSame(null, $uc3->get('proficiency')); + $this->assertEquals(user_competency::STATUS_IDLE, $uc3->get('status')); + $this->assertEquals(1, evidence::count_records(array('usercompetencyid' => $uc3->get('id')))); // Check rule nothing. api::add_evidence($u1->id, $c4a, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); - $uc4a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c4a->get_id())); - $this->assertEquals(true, $uc1a->get_proficiency()); - $this->assertFalse(user_competency::record_exists_select('userid = ? AND competencyid = ?', array($u1->id, $c4->get_id()))); + $uc4a = user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c4a->get('id'))); + $this->assertEquals(true, $uc1a->get('proficiency')); + $this->assertFalse(user_competency::record_exists_select('userid = ? AND competencyid = ?', array($u1->id, $c4->get('id')))); // Check marking on something that has no parent. This just checks that nothing breaks. api::add_evidence($u1->id, $c5, $ctxid, evidence::ACTION_COMPLETE, 'commentincontext', 'core'); @@ -2475,7 +2475,7 @@ class core_competency_api_testcase extends advanced_testcase { // Create a competency for the course. $lpg = $dg->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Add evidence. api::add_evidence($student->id, $comp, $syscontext, evidence::ACTION_OVERRIDE, @@ -2484,7 +2484,7 @@ class core_competency_api_testcase extends advanced_testcase { // Query for user_competency_course data. $filterparams = array( 'userid' => $student->id, - 'competencyid' => $comp->get_id(), + 'competencyid' => $comp->get('id'), ); $usercompcourse = \core_competency\user_competency_course::get_record($filterparams); // There should be no user_competency_course object created when grading. @@ -2519,13 +2519,13 @@ class core_competency_api_testcase extends advanced_testcase { $lpg = $dg->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); // Do not push ratings from course to user plans. - $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $lpg->create_course_competency(array('courseid' => $course->id, 'competencyid' => $comp->get_id())); + $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $lpg->create_course_competency(array('courseid' => $course->id, 'competencyid' => $comp->get('id'))); // Query for user_competency_course data. $filterparams = array( 'userid' => $student->id, - 'competencyid' => $comp->get_id(), + 'competencyid' => $comp->get('id'), 'courseid' => $course->id ); @@ -2536,21 +2536,21 @@ class core_competency_api_testcase extends advanced_testcase { $usercompcourse = \core_competency\user_competency_course::get_record($filterparams); // There should be a user_competency_course object when adding a grade. $this->assertNotEmpty($usercompcourse); - $grade = $evidence->get_grade(); - $this->assertEquals($grade, $usercompcourse->get_grade()); - $this->assertEquals(3, $usercompcourse->get_grade()); + $grade = $evidence->get('grade'); + $this->assertEquals($grade, $usercompcourse->get('grade')); + $this->assertEquals(3, $usercompcourse->get('grade')); $proficiency = $comp->get_proficiency_of_grade($grade); - $this->assertEquals($proficiency, $usercompcourse->get_proficiency()); + $this->assertEquals($proficiency, $usercompcourse->get('proficiency')); // Confirm that the user competency's grade/proficiency has not been affected by the grade. $usercompetencyparams = [ 'userid' => $student->id, - 'competencyid' => $comp->get_id(), + 'competencyid' => $comp->get('id'), ]; $usercompetency = \core_competency\user_competency::get_record($usercompetencyparams); $this->assertNotEmpty($usercompetency); - $this->assertNotEquals($usercompcourse->get_grade(), $usercompetency->get_grade()); - $this->assertNotEquals($usercompcourse->get_proficiency(), $usercompetency->get_proficiency()); + $this->assertNotEquals($usercompcourse->get('grade'), $usercompetency->get('grade')); + $this->assertNotEquals($usercompcourse->get('proficiency'), $usercompetency->get('proficiency')); } public function test_observe_course_completed() { @@ -2563,17 +2563,17 @@ class core_competency_api_testcase extends advanced_testcase { $coursectx = context_course::instance($course->id); $u1 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $cc1 = $lpg->create_course_competency(array('competencyid' => $c1->get_id(), 'courseid' => $course->id, + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $cc1 = $lpg->create_course_competency(array('competencyid' => $c1->get('id'), 'courseid' => $course->id, 'ruleoutcome' => \core_competency\course_competency::OUTCOME_NONE)); - $cc2 = $lpg->create_course_competency(array('competencyid' => $c2->get_id(), 'courseid' => $course->id, + $cc2 = $lpg->create_course_competency(array('competencyid' => $c2->get('id'), 'courseid' => $course->id, 'ruleoutcome' => \core_competency\course_competency::OUTCOME_EVIDENCE)); - $cc3 = $lpg->create_course_competency(array('competencyid' => $c3->get_id(), 'courseid' => $course->id, + $cc3 = $lpg->create_course_competency(array('competencyid' => $c3->get('id'), 'courseid' => $course->id, 'ruleoutcome' => \core_competency\course_competency::OUTCOME_RECOMMEND)); - $cc4 = $lpg->create_course_competency(array('competencyid' => $c4->get_id(), 'courseid' => $course->id, + $cc4 = $lpg->create_course_competency(array('competencyid' => $c4->get('id'), 'courseid' => $course->id, 'ruleoutcome' => \core_competency\course_competency::OUTCOME_COMPLETE)); $event = \core\event\course_completed::create(array( @@ -2593,59 +2593,59 @@ class core_competency_api_testcase extends advanced_testcase { // Outcome NONE did nothing. $this->assertFalse(\core_competency\user_competency::record_exists_select('userid = :uid AND competencyid = :cid', array( - 'uid' => $u1->id, 'cid' => $c1->get_id() + 'uid' => $u1->id, 'cid' => $c1->get('id') ))); // Outcome evidence. - $uc2 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $ev2 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc2->get_id())); + $uc2 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $ev2 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc2->get('id'))); - $this->assertEquals(null, $uc2->get_grade()); - $this->assertEquals(null, $uc2->get_proficiency()); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc2->get_status()); + $this->assertEquals(null, $uc2->get('grade')); + $this->assertEquals(null, $uc2->get('proficiency')); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc2->get('status')); - $this->assertEquals('evidence_coursecompleted', $ev2->get_descidentifier()); - $this->assertEquals('core_competency', $ev2->get_desccomponent()); - $this->assertEquals($course->shortname, $ev2->get_desca()); - $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev2->get_url()); - $this->assertEquals(null, $ev2->get_grade()); - $this->assertEquals($coursectx->id, $ev2->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_LOG, $ev2->get_action()); - $this->assertEquals(null, $ev2->get_actionuserid()); + $this->assertEquals('evidence_coursecompleted', $ev2->get('descidentifier')); + $this->assertEquals('core_competency', $ev2->get('desccomponent')); + $this->assertEquals($course->shortname, $ev2->get('desca')); + $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev2->get('url')); + $this->assertEquals(null, $ev2->get('grade')); + $this->assertEquals($coursectx->id, $ev2->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_LOG, $ev2->get('action')); + $this->assertEquals(null, $ev2->get('actionuserid')); // Outcome recommend. - $uc3 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3->get_id())); - $ev3 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc3->get_id())); + $uc3 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c3->get('id'))); + $ev3 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc3->get('id'))); - $this->assertEquals(null, $uc3->get_grade()); - $this->assertEquals(null, $uc3->get_proficiency()); - $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc3->get_status()); + $this->assertEquals(null, $uc3->get('grade')); + $this->assertEquals(null, $uc3->get('proficiency')); + $this->assertEquals(\core_competency\user_competency::STATUS_WAITING_FOR_REVIEW, $uc3->get('status')); - $this->assertEquals('evidence_coursecompleted', $ev3->get_descidentifier()); - $this->assertEquals('core_competency', $ev3->get_desccomponent()); - $this->assertEquals($course->shortname, $ev3->get_desca()); - $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev3->get_url()); - $this->assertEquals(null, $ev3->get_grade()); - $this->assertEquals($coursectx->id, $ev3->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_LOG, $ev3->get_action()); - $this->assertEquals(null, $ev3->get_actionuserid()); + $this->assertEquals('evidence_coursecompleted', $ev3->get('descidentifier')); + $this->assertEquals('core_competency', $ev3->get('desccomponent')); + $this->assertEquals($course->shortname, $ev3->get('desca')); + $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev3->get('url')); + $this->assertEquals(null, $ev3->get('grade')); + $this->assertEquals($coursectx->id, $ev3->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_LOG, $ev3->get('action')); + $this->assertEquals(null, $ev3->get('actionuserid')); // Outcome complete. - $uc4 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c4->get_id())); - $ev4 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc4->get_id())); + $uc4 = \core_competency\user_competency::get_record(array('userid' => $u1->id, 'competencyid' => $c4->get('id'))); + $ev4 = \core_competency\evidence::get_record(array('usercompetencyid' => $uc4->get('id'))); - $this->assertEquals(3, $uc4->get_grade()); - $this->assertEquals(1, $uc4->get_proficiency()); - $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc4->get_status()); + $this->assertEquals(3, $uc4->get('grade')); + $this->assertEquals(1, $uc4->get('proficiency')); + $this->assertEquals(\core_competency\user_competency::STATUS_IDLE, $uc4->get('status')); - $this->assertEquals('evidence_coursecompleted', $ev4->get_descidentifier()); - $this->assertEquals('core_competency', $ev4->get_desccomponent()); - $this->assertEquals($course->shortname, $ev4->get_desca()); - $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev4->get_url()); - $this->assertEquals(3, $ev4->get_grade()); - $this->assertEquals($coursectx->id, $ev4->get_contextid()); - $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $ev4->get_action()); - $this->assertEquals(null, $ev4->get_actionuserid()); + $this->assertEquals('evidence_coursecompleted', $ev4->get('descidentifier')); + $this->assertEquals('core_competency', $ev4->get('desccomponent')); + $this->assertEquals($course->shortname, $ev4->get('desca')); + $this->assertStringEndsWith('/report/completion/index.php?course=' . $course->id, $ev4->get('url')); + $this->assertEquals(3, $ev4->get('grade')); + $this->assertEquals($coursectx->id, $ev4->get('contextid')); + $this->assertEquals(\core_competency\evidence::ACTION_COMPLETE, $ev4->get('action')); + $this->assertEquals(null, $ev4->get('actionuserid')); } public function test_list_evidence_in_course() { @@ -2660,10 +2660,10 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $f = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $cc = api::add_competency_to_course($course->id, $c->get_id()); - $cc2 = api::add_competency_to_course($course->id, $c2->get_id()); + $c = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $cc = api::add_competency_to_course($course->id, $c->get('id')); + $cc2 = api::add_competency_to_course($course->id, $c2->get('id')); $pagegenerator = $this->getDataGenerator()->get_plugin_generator('mod_page'); $page = $pagegenerator->create_instance(array('course' => $course->id)); @@ -2671,22 +2671,22 @@ class core_competency_api_testcase extends advanced_testcase { $cm = get_coursemodule_from_instance('page', $page->id); $cmcontext = context_module::instance($cm->id); // Add the competency to the course module. - $ccm = api::add_competency_to_course_module($cm, $c->get_id()); + $ccm = api::add_competency_to_course_module($cm, $c->get('id')); // Now add the evidence to the course. - $evidence1 = api::add_evidence($u1->id, $c->get_id(), $coursecontext->id, \core_competency\evidence::ACTION_LOG, + $evidence1 = api::add_evidence($u1->id, $c->get('id'), $coursecontext->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error'); - $result = api::list_evidence_in_course($u1->id, $course->id, $c->get_id()); - $this->assertEquals($result[0]->get_id(), $evidence1->get_id()); + $result = api::list_evidence_in_course($u1->id, $course->id, $c->get('id')); + $this->assertEquals($result[0]->get('id'), $evidence1->get('id')); // Now add the evidence to the course module. - $evidence2 = api::add_evidence($u1->id, $c->get_id(), $cmcontext->id, \core_competency\evidence::ACTION_LOG, + $evidence2 = api::add_evidence($u1->id, $c->get('id'), $cmcontext->id, \core_competency\evidence::ACTION_LOG, 'invaliddata', 'error'); - $result = api::list_evidence_in_course($u1->id, $course->id, $c->get_id(), 'timecreated', 'ASC'); - $this->assertEquals($evidence1->get_id(), $result[0]->get_id()); - $this->assertEquals($evidence2->get_id(), $result[1]->get_id()); + $result = api::list_evidence_in_course($u1->id, $course->id, $c->get('id'), 'timecreated', 'ASC'); + $this->assertEquals($evidence1->get('id'), $result[0]->get('id')); + $this->assertEquals($evidence2->get('id'), $result[1]->get('id')); } public function test_list_course_modules_using_competency() { @@ -2702,14 +2702,14 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $f = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $cc = api::add_competency_to_course($course->id, $c->get_id()); - $cc2 = api::add_competency_to_course($course->id, $c2->get_id()); + $c = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $cc = api::add_competency_to_course($course->id, $c->get('id')); + $cc2 = api::add_competency_to_course($course->id, $c2->get('id')); // First check we get an empty list when there are no links. $expected = array(); - $result = api::list_course_modules_using_competency($c->get_id(), $course->id); + $result = api::list_course_modules_using_competency($c->get('id'), $course->id); $this->assertEquals($expected, $result); $pagegenerator = $this->getDataGenerator()->get_plugin_generator('mod_page'); @@ -2717,42 +2717,42 @@ class core_competency_api_testcase extends advanced_testcase { $cm = get_coursemodule_from_instance('page', $page->id); // Add a link and list again. - $ccm = api::add_competency_to_course_module($cm, $c->get_id()); + $ccm = api::add_competency_to_course_module($cm, $c->get('id')); $expected = array($cm->id); - $result = api::list_course_modules_using_competency($c->get_id(), $course->id); + $result = api::list_course_modules_using_competency($c->get('id'), $course->id); $this->assertEquals($expected, $result); // Check a different course. $expected = array(); - $result = api::list_course_modules_using_competency($c->get_id(), $course2->id); + $result = api::list_course_modules_using_competency($c->get('id'), $course2->id); $this->assertEquals($expected, $result); // Remove the link and check again. - $result = api::remove_competency_from_course_module($cm, $c->get_id()); + $result = api::remove_competency_from_course_module($cm, $c->get('id')); $expected = true; $this->assertEquals($expected, $result); $expected = array(); - $result = api::list_course_modules_using_competency($c->get_id(), $course->id); + $result = api::list_course_modules_using_competency($c->get('id'), $course->id); $this->assertEquals($expected, $result); // Now add 2 links. - api::add_competency_to_course_module($cm, $c->get_id()); - api::add_competency_to_course_module($cm, $c2->get_id()); + api::add_competency_to_course_module($cm, $c->get('id')); + api::add_competency_to_course_module($cm, $c2->get('id')); $result = api::list_course_module_competencies_in_course_module($cm->id); - $this->assertEquals($result[0]->get_competencyid(), $c->get_id()); - $this->assertEquals($result[1]->get_competencyid(), $c2->get_id()); + $this->assertEquals($result[0]->get('competencyid'), $c->get('id')); + $this->assertEquals($result[1]->get('competencyid'), $c2->get('id')); // Now re-order. - api::reorder_course_module_competency($cm, $c->get_id(), $c2->get_id()); + api::reorder_course_module_competency($cm, $c->get('id'), $c2->get('id')); $result = api::list_course_module_competencies_in_course_module($cm->id); - $this->assertEquals($result[0]->get_competencyid(), $c2->get_id()); - $this->assertEquals($result[1]->get_competencyid(), $c->get_id()); + $this->assertEquals($result[0]->get('competencyid'), $c2->get('id')); + $this->assertEquals($result[1]->get('competencyid'), $c->get('id')); // And re-order again. - api::reorder_course_module_competency($cm, $c->get_id(), $c2->get_id()); + api::reorder_course_module_competency($cm, $c->get('id'), $c2->get('id')); $result = api::list_course_module_competencies_in_course_module($cm->id); - $this->assertEquals($result[0]->get_competencyid(), $c->get_id()); - $this->assertEquals($result[1]->get_competencyid(), $c2->get_id()); + $this->assertEquals($result[0]->get('competencyid'), $c->get('id')); + $this->assertEquals($result[1]->get('competencyid'), $c2->get('id')); } /** @@ -2768,20 +2768,20 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $f = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $cc = api::add_competency_to_course($course->id, $c->get_id()); + $c = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $cc = api::add_competency_to_course($course->id, $c->get('id')); // Check record was created with default rule value Evidence. $this->assertEquals(1, \core_competency\course_competency::count_records()); $recordscc = api::list_course_competencies($course->id); $this->assertEquals(\core_competency\course_competency::OUTCOME_EVIDENCE, - $recordscc[0]['coursecompetency']->get_ruleoutcome()); + $recordscc[0]['coursecompetency']->get('ruleoutcome')); // Check ruleoutcome value is updated to None. - $this->assertTrue(api::set_course_competency_ruleoutcome($recordscc[0]['coursecompetency']->get_id(), + $this->assertTrue(api::set_course_competency_ruleoutcome($recordscc[0]['coursecompetency']->get('id'), \core_competency\course_competency::OUTCOME_NONE)); $recordscc = api::list_course_competencies($course->id); - $this->assertEquals(\core_competency\course_competency::OUTCOME_NONE, $recordscc[0]['coursecompetency']->get_ruleoutcome()); + $this->assertEquals(\core_competency\course_competency::OUTCOME_NONE, $recordscc[0]['coursecompetency']->get('ruleoutcome')); } /** @@ -2810,17 +2810,17 @@ class core_competency_api_testcase extends advanced_testcase { 'scaleconfiguration' => $scaleconfiguration1 ); $framework = $lpg->create_framework($frm); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create competency with its own scale configuration. - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'scaleid' => $s2->id, 'scaleconfiguration' => $scaleconfiguration2 )); // Detecte invalid grade in competency using its framework competency scale. try { - $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c1->get_id(), + $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c1->get('id'), 'proficiency' => true, 'grade' => 3 )); $usercompetency->create(); $this->fail('Invalid grade not detected in framework scale'); @@ -2830,7 +2830,7 @@ class core_competency_api_testcase extends advanced_testcase { // Detecte invalid grade in competency using its own scale. try { - $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c2->get_id(), + $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c2->get('id'), 'proficiency' => true, 'grade' => 5 )); $usercompetency->create(); $this->fail('Invalid grade not detected in competency scale'); @@ -2840,7 +2840,7 @@ class core_competency_api_testcase extends advanced_testcase { // Accept valid grade in competency using its framework competency scale. try { - $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c1->get_id(), + $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c1->get('id'), 'proficiency' => true, 'grade' => 1 )); $usercompetency->create(); $this->assertTrue(true); @@ -2850,7 +2850,7 @@ class core_competency_api_testcase extends advanced_testcase { // Accept valid grade in competency using its framework competency scale. try { - $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c2->get_id(), + $usercompetency = new user_competency(0, (object) array('userid' => $user->id, 'competencyid' => $c2->get('id'), 'proficiency' => true, 'grade' => 4 )); $usercompetency->create(); $this->assertTrue(true); @@ -2882,11 +2882,11 @@ class core_competency_api_testcase extends advanced_testcase { 'visible' => false ); $framework = $lpg->create_framework($frm); - $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Linking competency that belong to hidden framework to course. try { - api::add_competency_to_course($course->id, $competency->get_id()); + api::add_competency_to_course($course->id, $competency->get('id')); $this->fail('A competency belonging to hidden framework can not be linked to course'); } catch (coding_exception $e) { $this->assertTrue(true); @@ -2894,7 +2894,7 @@ class core_competency_api_testcase extends advanced_testcase { // Adding competency that belong to hidden framework to template. try { - api::add_competency_to_template($template->get_id(), $competency->get_id()); + api::add_competency_to_template($template->get('id'), $competency->get('id')); $this->fail('A competency belonging to hidden framework can not be added to template'); } catch (coding_exception $e) { $this->assertTrue(true); @@ -2902,7 +2902,7 @@ class core_competency_api_testcase extends advanced_testcase { // Adding competency that belong to hidden framework to plan. try { - api::add_competency_to_plan($plan->get_id(), $competency->get_id()); + api::add_competency_to_plan($plan->get('id'), $competency->get('id')); $this->fail('A competency belonging to hidden framework can not be added to plan'); } catch (coding_exception $e) { $this->assertTrue(true); @@ -2926,14 +2926,14 @@ class core_competency_api_testcase extends advanced_testcase { // Can not link hidden template to plan. try { - api::create_plan_from_template($template->get_id(), $user->id); + api::create_plan_from_template($template->get('id'), $user->id); $this->fail('Can not link a hidden template to plan'); } catch (coding_exception $e) { $this->assertTrue(true); } // Can associate hidden template to cohort. - $templatecohort = api::create_template_cohort($template->get_id(), $cohort->id); + $templatecohort = api::create_template_cohort($template->get('id'), $cohort->id); $this->assertInstanceOf('\core_competency\template_cohort', $templatecohort); } @@ -2951,36 +2951,36 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create template and assign competencies. $tp = $lpg->create_template(); - $tpc1 = $lpg->create_template_competency(array('templateid' => $tp->get_id(), 'competencyid' => $c1->get_id())); - $tpc2 = $lpg->create_template_competency(array('templateid' => $tp->get_id(), 'competencyid' => $c2->get_id())); - $tpc3 = $lpg->create_template_competency(array('templateid' => $tp->get_id(), 'competencyid' => $c3->get_id())); + $tpc1 = $lpg->create_template_competency(array('templateid' => $tp->get('id'), 'competencyid' => $c1->get('id'))); + $tpc2 = $lpg->create_template_competency(array('templateid' => $tp->get('id'), 'competencyid' => $c2->get('id'))); + $tpc3 = $lpg->create_template_competency(array('templateid' => $tp->get('id'), 'competencyid' => $c3->get('id'))); // Create a plan form template and change it status to complete. - $plan = $lpg->create_plan(array('userid' => $user->id, 'templateid' => $tp->get_id())); + $plan = $lpg->create_plan(array('userid' => $user->id, 'templateid' => $tp->get('id'))); api::complete_plan($plan); // Check user competency plan created correctly. $this->assertEquals(3, \core_competency\user_competency_plan::count_records()); $ucp = \core_competency\user_competency_plan::get_records(); - $this->assertEquals($ucp[0]->get_competencyid(), $c1->get_id()); - $this->assertEquals($ucp[1]->get_competencyid(), $c2->get_id()); - $this->assertEquals($ucp[2]->get_competencyid(), $c3->get_id()); + $this->assertEquals($ucp[0]->get('competencyid'), $c1->get('id')); + $this->assertEquals($ucp[1]->get('competencyid'), $c2->get('id')); + $this->assertEquals($ucp[2]->get('competencyid'), $c3->get('id')); // Add and remove a competency from the template. - api::add_competency_to_template($tp->get_id(), $c4->get_id()); - api::remove_competency_from_template($tp->get_id(), $c1->get_id()); + api::add_competency_to_template($tp->get('id'), $c4->get('id')); + api::remove_competency_from_template($tp->get('id'), $c1->get('id')); // Check that user competency plan did not change. $competencies = $plan->get_competencies(); $this->assertEquals(3, count($competencies)); - $ucp1 = array($c1->get_id(), $c2->get_id(), $c3->get_id()); + $ucp1 = array($c1->get('id'), $c2->get('id'), $c3->get('id')); $ucp2 = array(); foreach ($competencies as $id => $cmp) { $ucp2[] = $id; @@ -2995,30 +2995,30 @@ class core_competency_api_testcase extends advanced_testcase { $this->setAdminUser(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1a1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c1a1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1b1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c1b1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1a1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c1a1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1b1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c1b1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); - $c1->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c1->set_ruletype('core_competency\\competency_rule_all'); + $c1->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c1->set('ruletype', 'core_competency\\competency_rule_all'); $c1->update(); - $c1a->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c1a->set_ruletype('core_competency\\competency_rule_all'); + $c1a->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c1a->set('ruletype', 'core_competency\\competency_rule_all'); $c1a->update(); - $c1a1->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c1a1->set_ruletype('core_competency\\competency_rule_all'); + $c1a1->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c1a1->set('ruletype', 'core_competency\\competency_rule_all'); $c1a1->update(); - $c1b->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c1b->set_ruletype('core_competency\\competency_rule_all'); + $c1b->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c1b->set('ruletype', 'core_competency\\competency_rule_all'); $c1b->update(); - $c2->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c2->set_ruletype('core_competency\\competency_rule_all'); + $c2->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c2->set('ruletype', 'core_competency\\competency_rule_all'); $c2->update(); return array( @@ -3049,20 +3049,20 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Moving up and down doesn't change anything. - api::move_down_competency($c1a->get_id()); + api::move_down_competency($c1a->get('id')); $c1->read(); $c1a->read(); $c1a1->read(); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get_ruleoutcome()); - api::move_up_competency($c1a->get_id()); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get('ruleoutcome')); + api::move_up_competency($c1a->get('id')); $c1->read(); $c1a->read(); $c1a1->read(); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get('ruleoutcome')); } public function test_moving_competency_reset_rules_parent() { @@ -3079,17 +3079,17 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Moving out of parent will reset the parent, and the destination. - api::set_parent_competency($c1a->get_id(), $c1b->get_id()); + api::set_parent_competency($c1a->get('id'), $c1b->get('id')); $c1->read(); $c1a->read(); $c1a1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_NONE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_NONE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_NONE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_NONE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_moving_competency_reset_rules_totoplevel() { @@ -3106,17 +3106,17 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Moving to top level only affects the initial parent. - api::set_parent_competency($c1a1->get_id(), 0); + api::set_parent_competency($c1a1->get('id'), 0); $c1->read(); $c1a->read(); $c1a1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_NONE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_NONE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_moving_competency_reset_rules_fromtoplevel() { @@ -3133,17 +3133,17 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Moving from top level only affects the destination parent. - api::set_parent_competency($c2->get_id(), $c1a1->get_id()); + api::set_parent_competency($c2->get('id'), $c1a1->get('id')); $c1->read(); $c1a->read(); $c1a1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_NONE, $c1a1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_NONE, $c1a1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_moving_competency_reset_rules_child() { @@ -3160,17 +3160,17 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Moving to a child of self resets self, parent and destination. - api::set_parent_competency($c1a->get_id(), $c1a1->get_id()); + api::set_parent_competency($c1a->get('id'), $c1a1->get('id')); $c1->read(); $c1a->read(); $c1a1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_NONE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_NONE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_NONE, $c1a1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_NONE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_NONE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_NONE, $c1a1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_create_competency_reset_rules() { @@ -3187,18 +3187,18 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Adding a new competency resets the rule of its parent. - api::create_competency((object) array('shortname' => 'A', 'parentid' => $c1->get_id(), 'idnumber' => 'A', - 'competencyframeworkid' => $f1->get_id())); + api::create_competency((object) array('shortname' => 'A', 'parentid' => $c1->get('id'), 'idnumber' => 'A', + 'competencyframeworkid' => $f1->get('id'))); $c1->read(); $c1a->read(); $c1a1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_NONE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_NONE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1a1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_delete_competency_reset_rules() { @@ -3215,13 +3215,13 @@ class core_competency_api_testcase extends advanced_testcase { $c2a = $data['c2a']; // Deleting a competency resets the rule of its parent. - api::delete_competency($c1a->get_id()); + api::delete_competency($c1a->get('id')); $c1->read(); $c1b->read(); $c2->read(); - $this->assertEquals(competency::OUTCOME_NONE, $c1->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get_ruleoutcome()); - $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get_ruleoutcome()); + $this->assertEquals(competency::OUTCOME_NONE, $c1->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c1b->get('ruleoutcome')); + $this->assertEquals(competency::OUTCOME_EVIDENCE, $c2->get('ruleoutcome')); } public function test_template_has_related_data() { @@ -3236,11 +3236,11 @@ class core_competency_api_testcase extends advanced_testcase { // Create plans for first template. $time = time(); - $plan1 = $lpg->create_plan(array('templateid' => $tpl1->get_id(), 'userid' => $user->id, + $plan1 = $lpg->create_plan(array('templateid' => $tpl1->get('id'), 'userid' => $user->id, 'name' => 'Not good name', 'duedate' => $time + 3600, 'description' => 'Ahah', 'descriptionformat' => FORMAT_PLAIN)); - $this->assertTrue(api::template_has_related_data($tpl1->get_id())); - $this->assertFalse(api::template_has_related_data($tpl2->get_id())); + $this->assertTrue(api::template_has_related_data($tpl1->get('id'))); + $this->assertFalse(api::template_has_related_data($tpl2->get('id'))); } @@ -3253,34 +3253,34 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); $tpl = $lpg->create_template(); - $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1->get_id(), + $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1->get('id'), 'sortorder' => 1)); - $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c2->get_id(), + $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c2->get('id'), 'sortorder' => 2)); - $p1 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u1->id)); + $p1 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u1->id)); // Check pre-test. - $this->assertTrue(\core_competency\template::record_exists($tpl->get_id())); - $this->assertEquals(2, \core_competency\template_competency::count_competencies($tpl->get_id())); - $this->assertEquals(1, count(\core_competency\plan::get_records(array('templateid' => $tpl->get_id())))); + $this->assertTrue(\core_competency\template::record_exists($tpl->get('id'))); + $this->assertEquals(2, \core_competency\template_competency::count_competencies($tpl->get('id'))); + $this->assertEquals(1, count(\core_competency\plan::get_records(array('templateid' => $tpl->get('id'))))); - $result = api::delete_template($tpl->get_id(), true); + $result = api::delete_template($tpl->get('id'), true); $this->assertTrue($result); // Check that the template does not exist anymore. - $this->assertFalse(\core_competency\template::record_exists($tpl->get_id())); + $this->assertFalse(\core_competency\template::record_exists($tpl->get('id'))); // Check that associated competencies are also deleted. - $this->assertEquals(0, \core_competency\template_competency::count_competencies($tpl->get_id())); + $this->assertEquals(0, \core_competency\template_competency::count_competencies($tpl->get('id'))); // Check that associated plan are also deleted. - $this->assertEquals(0, count(\core_competency\plan::get_records(array('templateid' => $tpl->get_id())))); + $this->assertEquals(0, count(\core_competency\plan::get_records(array('templateid' => $tpl->get('id'))))); } public function test_delete_template_unlink_plans() { @@ -3292,37 +3292,37 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f->get('id'))); $tpl = $lpg->create_template(); - $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1->get_id(), + $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1->get('id'), 'sortorder' => 1)); - $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c2->get_id(), + $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c2->get('id'), 'sortorder' => 2)); - $p1 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u1->id)); + $p1 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u1->id)); // Check pre-test. - $this->assertTrue(\core_competency\template::record_exists($tpl->get_id())); - $this->assertEquals(2, \core_competency\template_competency::count_competencies($tpl->get_id())); - $this->assertEquals(1, count(\core_competency\plan::get_records(array('templateid' => $tpl->get_id())))); + $this->assertTrue(\core_competency\template::record_exists($tpl->get('id'))); + $this->assertEquals(2, \core_competency\template_competency::count_competencies($tpl->get('id'))); + $this->assertEquals(1, count(\core_competency\plan::get_records(array('templateid' => $tpl->get('id'))))); - $result = api::delete_template($tpl->get_id(), false); + $result = api::delete_template($tpl->get('id'), false); $this->assertTrue($result); // Check that the template does not exist anymore. - $this->assertFalse(\core_competency\template::record_exists($tpl->get_id())); + $this->assertFalse(\core_competency\template::record_exists($tpl->get('id'))); // Check that associated competencies are also deleted. - $this->assertEquals(0, \core_competency\template_competency::count_competencies($tpl->get_id())); + $this->assertEquals(0, \core_competency\template_competency::count_competencies($tpl->get('id'))); // Check that associated plan still exist but unlink from template. - $plans = \core_competency\plan::get_records(array('id' => $p1->get_id())); + $plans = \core_competency\plan::get_records(array('id' => $p1->get('id'))); $this->assertEquals(1, count($plans)); - $this->assertEquals($plans[0]->get_origtemplateid(), $tpl->get_id()); - $this->assertNull($plans[0]->get_templateid()); + $this->assertEquals($plans[0]->get('origtemplateid'), $tpl->get('id')); + $this->assertNull($plans[0]->get('templateid')); } public function test_delete_competency() { @@ -3334,55 +3334,55 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Set rules on parent competency. - $c1->set_ruleoutcome(competency::OUTCOME_EVIDENCE); - $c1->set_ruletype('core_competency\\competency_rule_all'); + $c1->set('ruleoutcome', competency::OUTCOME_EVIDENCE); + $c1->set('ruletype', 'core_competency\\competency_rule_all'); $c1->update(); // If we delete competeny, the related competencies relations and evidences should be deleted. // Create related competencies using one of c1a competency descendants. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $evidence = $lpg->create_evidence(array('usercompetencyid' => $uc2->get_id())); - $this->assertEquals($uc2->get_id(), $evidence->get_usercompetencyid()); + $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $evidence = $lpg->create_evidence(array('usercompetencyid' => $uc2->get('id'))); + $this->assertEquals($uc2->get('id'), $evidence->get('usercompetencyid')); $uc2->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); // Check that on delete, we reset the rule on parent competency. $c1->read(); - $this->assertNull($c1->get_ruletype()); - $this->assertNull($c1->get_ruletype()); - $this->assertEquals(competency::OUTCOME_NONE, $c1->get_ruleoutcome()); + $this->assertNull($c1->get('ruletype')); + $this->assertNull($c1->get('ruletype')); + $this->assertEquals(competency::OUTCOME_NONE, $c1->get('ruleoutcome')); // Check that descendants were also deleted. - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. - $this->assertEquals(0, count(api::list_related_competencies($c2->get_id()))); + $this->assertEquals(0, count(api::list_related_competencies($c2->get('id')))); // Delete a simple competency. - $this->assertTrue(api::delete_competency($c2->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); + $this->assertTrue(api::delete_competency($c2->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); } public function test_delete_competency_used_in_plan() { @@ -3396,26 +3396,26 @@ class core_competency_api_testcase extends advanced_testcase { $plan = $lpg->create_plan((object) array('userid' => $u1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Add competency to plan. - $pc = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c11b->get_id())); + $pc = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c11b->get('id'))); // We can not delete a competency , if competency or competency children is associated to plan. - $this->assertFalse(api::delete_competency($c1a->get_id())); + $this->assertFalse(api::delete_competency($c1a->get('id'))); // We can delete the competency if we remove the competency from the plan. $pc->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); } public function test_delete_competency_used_in_usercompetency() { @@ -3427,27 +3427,27 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create user competency. - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); // We can not delete a competency , if competency or competency children exist in user competency. - $this->assertFalse(api::delete_competency($c1a->get_id())); + $this->assertFalse(api::delete_competency($c1a->get('id'))); // We can delete the competency if we remove the competency from user competency. $uc1->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); } public function test_delete_competency_used_in_usercompetencyplan() { @@ -3461,31 +3461,31 @@ class core_competency_api_testcase extends advanced_testcase { $plan = $lpg->create_plan((object) array('userid' => $u1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create user competency plan. $uc2 = $lpg->create_user_competency_plan(array( 'userid' => $u1->id, - 'competencyid' => $c11b->get_id(), - 'planid' => $plan->get_id() + 'competencyid' => $c11b->get('id'), + 'planid' => $plan->get('id') )); // We can not delete a competency , if competency or competency children exist in user competency plan. - $this->assertFalse(api::delete_competency($c1a->get_id())); + $this->assertFalse(api::delete_competency($c1a->get('id'))); // We can delete the competency if we remove the competency from user competency plan. $uc2->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); } public function test_delete_competency_used_in_template() { @@ -3497,29 +3497,29 @@ class core_competency_api_testcase extends advanced_testcase { $template = $lpg->create_template(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Add competency to a template. $tc = $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $c11b->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $c11b->get('id') )); // We can not delete a competency , if competency or competency children is linked to template. - $this->assertFalse(api::delete_competency($c1a->get_id())); + $this->assertFalse(api::delete_competency($c1a->get('id'))); // We can delete the competency if we remove the competency from template. $tc->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); } public function test_delete_competency_used_in_course() { @@ -3533,30 +3533,30 @@ class core_competency_api_testcase extends advanced_testcase { $course = $dg->create_course(array('category' => $cat1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Add competency to course. $cc = $lpg->create_course_competency(array( 'courseid' => $course->id, - 'competencyid' => $c11b->get_id() + 'competencyid' => $c11b->get('id') )); // We can not delete a competency if the competency or competencies children is linked to a course. - $this->assertFalse(api::delete_competency($c1a->get_id())); + $this->assertFalse(api::delete_competency($c1a->get('id'))); // We can delete the competency if we remove the competency from course. $cc->delete(); - $this->assertTrue(api::delete_competency($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_competency($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); } public function test_delete_framework() { @@ -3568,49 +3568,49 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // If we delete framework, the related competencies relations and evidences should be deleted. // Create related competencies using one of c1a competency descendants. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $evidence = $lpg->create_evidence(array('usercompetencyid' => $uc2->get_id())); - $this->assertEquals($uc2->get_id(), $evidence->get_usercompetencyid()); + $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $evidence = $lpg->create_evidence(array('usercompetencyid' => $uc2->get('id'))); + $this->assertEquals($uc2->get('id'), $evidence->get('usercompetencyid')); $uc2->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency_framework::record_exists($f1->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency_framework::record_exists($f1->get('id'))); // Check that all competencies were also deleted. - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); // Delete a simple framework. $f2 = $lpg->create_framework(); - $this->assertTrue(api::delete_framework($f2->get_id())); - $this->assertFalse(competency_framework::record_exists($f2->get_id())); + $this->assertTrue(api::delete_framework($f2->get('id'))); + $this->assertFalse(competency_framework::record_exists($f2->get('id'))); } public function test_delete_framework_competency_used_in_plan() { @@ -3624,48 +3624,48 @@ class core_competency_api_testcase extends advanced_testcase { $plan = $lpg->create_plan((object) array('userid' => $u1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create related competencies. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $usercompetencyid = $uc2->get_id(); + $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $usercompetencyid = $uc2->get('id'); $evidence = $lpg->create_evidence(array('usercompetencyid' => $usercompetencyid)); - $this->assertEquals($uc2->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc2->get('id'), $evidence->get('usercompetencyid')); $uc2->delete(); // Add competency to plan. - $pc = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c11b->get_id())); + $pc = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c11b->get('id'))); // We can not delete a framework , if competency or competency children is associated to plan. - $this->assertFalse(api::delete_framework($f1->get_id())); + $this->assertFalse(api::delete_framework($f1->get('id'))); // Check that none of associated data are deleted. - $this->assertEquals($usercompetencyid, $evidence->read()->get_usercompetencyid()); - $this->assertEquals($c2->get_id(), $rc->read()->get_competencyid()); + $this->assertEquals($usercompetencyid, $evidence->read()->get('usercompetencyid')); + $this->assertEquals($c2->get('id'), $rc->read()->get('competencyid')); // We can delete the competency if we remove the competency from the plan. $pc->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); @@ -3680,49 +3680,49 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create related competencies. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $usercompetencyid = $uc1->get_id(); + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $usercompetencyid = $uc1->get('id'); $evidence = $lpg->create_evidence(array('usercompetencyid' => $usercompetencyid)); - $this->assertEquals($uc1->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc1->get('id'), $evidence->get('usercompetencyid')); $uc1->delete(); // Create user competency. - $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); + $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); // We can not delete a framework , if competency or competency children exist in user competency. - $this->assertFalse(api::delete_framework($f1->get_id())); + $this->assertFalse(api::delete_framework($f1->get('id'))); // Check that none of associated data are deleted. - $this->assertEquals($usercompetencyid, $evidence->read()->get_usercompetencyid()); - $this->assertEquals($c2->get_id(), $rc->read()->get_competencyid()); + $this->assertEquals($usercompetencyid, $evidence->read()->get('usercompetencyid')); + $this->assertEquals($c2->get('id'), $rc->read()->get('competencyid')); // We can delete the framework if we remove the competency from user competency. $uc2->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); @@ -3739,53 +3739,53 @@ class core_competency_api_testcase extends advanced_testcase { $plan = $lpg->create_plan((object) array('userid' => $u1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create related competencies. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $usercompetencyid = $uc1->get_id(); + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $usercompetencyid = $uc1->get('id'); $evidence = $lpg->create_evidence(array('usercompetencyid' => $usercompetencyid)); - $this->assertEquals($uc1->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc1->get('id'), $evidence->get('usercompetencyid')); $uc1->delete(); // Create user competency plan. $uc2 = $lpg->create_user_competency_plan(array( 'userid' => $u1->id, - 'competencyid' => $c11b->get_id(), - 'planid' => $plan->get_id() + 'competencyid' => $c11b->get('id'), + 'planid' => $plan->get('id') )); // We can not delete a framework , if competency or competency children exist in user competency plan. - $this->assertFalse(api::delete_framework($f1->get_id())); + $this->assertFalse(api::delete_framework($f1->get('id'))); // Check that none of associated data are deleted. - $this->assertEquals($usercompetencyid, $evidence->read()->get_usercompetencyid()); - $this->assertEquals($c2->get_id(), $rc->read()->get_competencyid()); + $this->assertEquals($usercompetencyid, $evidence->read()->get('usercompetencyid')); + $this->assertEquals($c2->get('id'), $rc->read()->get('competencyid')); // We can delete the framework if we remove the competency from user competency plan. $uc2->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); @@ -3801,51 +3801,51 @@ class core_competency_api_testcase extends advanced_testcase { $template = $lpg->create_template(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create related competencies. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $usercompetencyid = $uc1->get_id(); + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $usercompetencyid = $uc1->get('id'); $evidence = $lpg->create_evidence(array('usercompetencyid' => $usercompetencyid)); - $this->assertEquals($uc1->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc1->get('id'), $evidence->get('usercompetencyid')); $uc1->delete(); // Add competency to a template. $tc = $lpg->create_template_competency(array( - 'templateid' => $template->get_id(), - 'competencyid' => $c11b->get_id() + 'templateid' => $template->get('id'), + 'competencyid' => $c11b->get('id') )); // We can not delete a framework , if competency or competency children is linked to template. - $this->assertFalse(api::delete_framework($f1->get_id())); + $this->assertFalse(api::delete_framework($f1->get('id'))); // Check that none of associated data are deleted. - $this->assertEquals($usercompetencyid, $evidence->read()->get_usercompetencyid()); - $this->assertEquals($c2->get_id(), $rc->read()->get_competencyid()); + $this->assertEquals($usercompetencyid, $evidence->read()->get('usercompetencyid')); + $this->assertEquals($c2->get('id'), $rc->read()->get('competencyid')); // We can delete the framework if we remove the competency from template. $tc->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); @@ -3862,52 +3862,52 @@ class core_competency_api_testcase extends advanced_testcase { $course = $dg->create_course(array('category' => $cat1->id)); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2id = $c2->get_id(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1a->get_id())); - $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); - $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1b->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2id = $c2->get('id'); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1a->get('id'))); + $c11b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); + $c12b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1b->get('id'))); // Create related competencies. $rc = $lpg->create_related_competency(array( - 'competencyid' => $c2->get_id(), - 'relatedcompetencyid' => $c11b->get_id() + 'competencyid' => $c2->get('id'), + 'relatedcompetencyid' => $c11b->get('id') )); - $this->assertEquals($c11b->get_id(), $rc->get_relatedcompetencyid()); + $this->assertEquals($c11b->get('id'), $rc->get('relatedcompetencyid')); // Creating a standard evidence with minimal information. - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get_id())); - $usercompetencyid = $uc1->get_id(); + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c11b->get('id'))); + $usercompetencyid = $uc1->get('id'); $evidence = $lpg->create_evidence(array('usercompetencyid' => $usercompetencyid)); - $this->assertEquals($uc1->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc1->get('id'), $evidence->get('usercompetencyid')); $uc1->delete(); // Add competency to course. $cc = $lpg->create_course_competency(array( 'courseid' => $course->id, - 'competencyid' => $c11b->get_id() + 'competencyid' => $c11b->get('id') )); // We can not delete a framework if the competency or competencies children is linked to a course. - $this->assertFalse(api::delete_framework($f1->get_id())); + $this->assertFalse(api::delete_framework($f1->get('id'))); // Check that none of associated data are deleted. - $this->assertEquals($usercompetencyid, $evidence->read()->get_usercompetencyid()); - $this->assertEquals($c2->get_id(), $rc->read()->get_competencyid()); + $this->assertEquals($usercompetencyid, $evidence->read()->get('usercompetencyid')); + $this->assertEquals($c2->get('id'), $rc->read()->get('competencyid')); // We can delete the framework if we remove the competency from course. $cc->delete(); - $this->assertTrue(api::delete_framework($f1->get_id())); - $this->assertFalse(competency::record_exists($c1->get_id())); - $this->assertFalse(competency::record_exists($c2->get_id())); - $this->assertFalse(competency::record_exists($c1a->get_id())); - $this->assertFalse(competency::record_exists($c1b->get_id())); - $this->assertFalse(competency::record_exists($c11b->get_id())); - $this->assertFalse(competency::record_exists($c12b->get_id())); + $this->assertTrue(api::delete_framework($f1->get('id'))); + $this->assertFalse(competency::record_exists($c1->get('id'))); + $this->assertFalse(competency::record_exists($c2->get('id'))); + $this->assertFalse(competency::record_exists($c1a->get('id'))); + $this->assertFalse(competency::record_exists($c1b->get('id'))); + $this->assertFalse(competency::record_exists($c11b->get('id'))); + $this->assertFalse(competency::record_exists($c12b->get('id'))); // Check if evidence are also deleted. - $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get_id()))); + $this->assertEquals(0, \core_competency\user_evidence_competency::count_records(array('competencyid' => $c11b->get('id')))); // Check if related conpetency relation is deleted. $this->assertEquals(0, count(\core_competency\related_competency::get_multiple_relations(array($c2id)))); @@ -3931,9 +3931,9 @@ class core_competency_api_testcase extends advanced_testcase { $lpg = $dg->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $lpg->create_course_competency(array('courseid' => $c1->id, 'competencyid' => $comp1->get_id())); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $lpg->create_course_competency(array('courseid' => $c1->id, 'competencyid' => $comp1->get('id'))); $studentarch = get_archetype_roles('student'); $studentrole = array_shift($studentarch); @@ -3971,41 +3971,41 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($teacher1); $this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'View a user competency', - $c1->id, $student1->id, $comp1->get_id()); + $c1->id, $student1->id, $comp1->get('id')); // Give permission to view competencies. $dg->role_assign($canviewucrole, $teacher1->id, $c1ctx->id); accesslib_clear_all_caches_for_unit_testing(); $this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'Set competency rating', - $c1->id, $student1->id, $comp1->get_id()); + $c1->id, $student1->id, $comp1->get('id')); // Give permission to rate. $dg->role_assign($cangraderole, $teacher1->id, $c1ctx->id); accesslib_clear_all_caches_for_unit_testing(); - $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get_id()); + $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get('id')); // Remove permssion to read competencies, this leads to error. $dg->role_assign($cannotviewcomp, $teacher1->id, $sysctx->id); accesslib_clear_all_caches_for_unit_testing(); $this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'View competency frameworks', - $c1->id, $student1->id, $comp1->get_id()); + $c1->id, $student1->id, $comp1->get('id')); // Give permssion to manage course competencies, this leads to success. $dg->role_assign($canmanagecomp, $teacher1->id, $sysctx->id); accesslib_clear_all_caches_for_unit_testing(); - $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get_id()); + $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get('id')); // Try to grade a user that is not gradable, lead to errors. $this->assertExceptionWithGradeCompetencyInCourse('coding_exception', 'The competency may not be rated at this time.', - $c1->id, $student2->id, $comp1->get_id()); + $c1->id, $student2->id, $comp1->get('id')); // Try to grade a competency not in the course. $this->assertExceptionWithGradeCompetencyInCourse('coding_exception', 'The competency does not belong to this course', - $c1->id, $student1->id, $comp2->get_id()); + $c1->id, $student1->id, $comp2->get('id')); // Try to grade a user that is not enrolled, even though they are 'gradable'. $this->assertExceptionWithGradeCompetencyInCourse('coding_exception', 'The competency may not be rated at this time.', - $c1->id, $notstudent1->id, $comp1->get_id()); + $c1->id, $notstudent1->id, $comp1->get('id')); // Give permission for non-editing teacher to grade. $dg->role_assign($canviewucrole, $noneditingteacher->id, $c1ctx->id); @@ -4013,7 +4013,7 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($noneditingteacher); accesslib_clear_all_caches_for_unit_testing(); - $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get_id()); + $this->assertSuccessWithGradeCompetencyInCourse($c1->id, $student1->id, $comp1->get('id')); } /** @@ -4031,7 +4031,7 @@ class core_competency_api_testcase extends advanced_testcase { $uc = user_competency::get_record(array('userid' => $userid, 'competencyid' => $compid)); $records = evidence::get_records(array(), 'id', 'DESC', 0, 1); $evidence = array_pop($records); - $this->assertEquals($uc->get_id(), $evidence->get_usercompetencyid()); + $this->assertEquals($uc->get('id'), $evidence->get('usercompetencyid')); } /** @@ -4079,39 +4079,39 @@ class core_competency_api_testcase extends advanced_testcase { // Create a framework and assign competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Create 2 user plans and add competency to each plan. $p1 = $lpg->create_plan(array('userid' => $user->id)); $p2 = $lpg->create_plan(array('userid' => $user->id)); - $pc1 = $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c1->get_id())); - $pc2 = $lpg->create_plan_competency(array('planid' => $p2->get_id(), 'competencyid' => $c1->get_id())); + $pc1 = $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c1->get('id'))); + $pc2 = $lpg->create_plan_competency(array('planid' => $p2->get('id'), 'competencyid' => $c1->get('id'))); // Create user competency and add an evidence. - $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $e1 = $lpg->create_evidence(array('usercompetencyid' => $uc->get_id())); + $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $e1 = $lpg->create_evidence(array('usercompetencyid' => $uc->get('id'))); // Check both plans as one evidence. - $this->assertEquals(1, count(api::list_evidence($user->id, $c1->get_id(), $p1->get_id()))); - $this->assertEquals(1, count(api::list_evidence($user->id, $c1->get_id(), $p2->get_id()))); + $this->assertEquals(1, count(api::list_evidence($user->id, $c1->get('id'), $p1->get('id')))); + $this->assertEquals(1, count(api::list_evidence($user->id, $c1->get('id'), $p2->get('id')))); // Complete second plan. - $p2->set_status(plan::STATUS_COMPLETE); + $p2->set('status', plan::STATUS_COMPLETE); $p2->update(); // Add another evidence for the same competency, but in the future (time + 1). - $e2 = $lpg->create_evidence(array('usercompetencyid' => $uc->get_id())); + $e2 = $lpg->create_evidence(array('usercompetencyid' => $uc->get('id'))); $evidencesql = "UPDATE {" . evidence::TABLE . "} SET timecreated = :currenttime WHERE id = :evidenceid"; - $DB->execute($evidencesql, array('currenttime' => time() + 1, 'evidenceid' => $e2->get_id())); + $DB->execute($evidencesql, array('currenttime' => time() + 1, 'evidenceid' => $e2->get('id'))); // Check that the first plan, which is not completed, has all the evidence. - $this->assertEquals(2, count(api::list_evidence($user->id, $c1->get_id(), $p1->get_id()))); + $this->assertEquals(2, count(api::list_evidence($user->id, $c1->get('id'), $p1->get('id')))); // Check that the second plan, completed before the new evidence, only has the first piece of evidence. - $listevidences = api::list_evidence($user->id, $c1->get_id(), $p2->get_id()); + $listevidences = api::list_evidence($user->id, $c1->get('id'), $p2->get('id')); $this->assertEquals(1, count($listevidences)); - $this->assertEquals($e1->get_id(), $listevidences[$e1->get_id()]->get_id()); + $this->assertEquals($e1->get('id'), $listevidences[$e1->get('id')]->get('id')); } /** @@ -4134,27 +4134,27 @@ class core_competency_api_testcase extends advanced_testcase { $dg->enrol_user($user->id, $c1->id, $studentrole->id); $framework = $lpg->create_framework(); - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp2->get_id(), 'courseid' => $c1->id)); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c1->id)); // Create a user competency for comp1. - api::grade_competency_in_course($c1, $user->id, $comp1->get_id(), 3, 'Unit test'); + api::grade_competency_in_course($c1, $user->id, $comp1->get('id'), 3, 'Unit test'); // Test for competency already exist in user_competency. - $uc = api::get_user_competency_in_course($c1->id, $user->id, $comp1->get_id()); - $this->assertEquals($comp1->get_id(), $uc->get_competencyid()); - $this->assertEquals($user->id, $uc->get_userid()); - $this->assertEquals(3, $uc->get_grade()); - $this->assertEquals(true, $uc->get_proficiency()); + $uc = api::get_user_competency_in_course($c1->id, $user->id, $comp1->get('id')); + $this->assertEquals($comp1->get('id'), $uc->get('competencyid')); + $this->assertEquals($user->id, $uc->get('userid')); + $this->assertEquals(3, $uc->get('grade')); + $this->assertEquals(true, $uc->get('proficiency')); // Test for competency does not exist in user_competency. - $uc2 = api::get_user_competency_in_course($c1->id, $user->id, $comp2->get_id()); - $this->assertEquals($comp2->get_id(), $uc2->get_competencyid()); - $this->assertEquals($user->id, $uc2->get_userid()); - $this->assertEquals(null, $uc2->get_grade()); - $this->assertEquals(null, $uc2->get_proficiency()); + $uc2 = api::get_user_competency_in_course($c1->id, $user->id, $comp2->get('id')); + $this->assertEquals($comp2->get('id'), $uc2->get('competencyid')); + $this->assertEquals($user->id, $uc2->get('userid')); + $this->assertEquals(null, $uc2->get('grade')); + $this->assertEquals(null, $uc2->get('proficiency')); } /** @@ -4186,38 +4186,38 @@ class core_competency_api_testcase extends advanced_testcase { $dg->enrol_user($u4->id, $c1->id, $studentrole->id); // Create 6 competencies. - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp6 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp6 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Link 6 out of 6 to a course. - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp2->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp3->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp4->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp5->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp6->get_id(), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp3->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp4->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp5->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp6->get('id'), 'courseid' => $c1->id)); // Rate some competencies. // User 1. - api::grade_competency_in_course($c1, $u1->id, $comp1->get_id(), 4, 'Unit test'); - api::grade_competency_in_course($c1, $u1->id, $comp2->get_id(), 4, 'Unit test'); - api::grade_competency_in_course($c1, $u1->id, $comp3->get_id(), 4, 'Unit test'); - api::grade_competency_in_course($c1, $u1->id, $comp4->get_id(), 4, 'Unit test'); + api::grade_competency_in_course($c1, $u1->id, $comp1->get('id'), 4, 'Unit test'); + api::grade_competency_in_course($c1, $u1->id, $comp2->get('id'), 4, 'Unit test'); + api::grade_competency_in_course($c1, $u1->id, $comp3->get('id'), 4, 'Unit test'); + api::grade_competency_in_course($c1, $u1->id, $comp4->get('id'), 4, 'Unit test'); // User 2. - api::grade_competency_in_course($c1, $u2->id, $comp1->get_id(), 1, 'Unit test'); - api::grade_competency_in_course($c1, $u2->id, $comp2->get_id(), 1, 'Unit test'); - api::grade_competency_in_course($c1, $u2->id, $comp3->get_id(), 1, 'Unit test'); - api::grade_competency_in_course($c1, $u2->id, $comp4->get_id(), 1, 'Unit test'); + api::grade_competency_in_course($c1, $u2->id, $comp1->get('id'), 1, 'Unit test'); + api::grade_competency_in_course($c1, $u2->id, $comp2->get('id'), 1, 'Unit test'); + api::grade_competency_in_course($c1, $u2->id, $comp3->get('id'), 1, 'Unit test'); + api::grade_competency_in_course($c1, $u2->id, $comp4->get('id'), 1, 'Unit test'); // User 3. - api::grade_competency_in_course($c1, $u3->id, $comp1->get_id(), 3, 'Unit test'); - api::grade_competency_in_course($c1, $u3->id, $comp2->get_id(), 3, 'Unit test'); + api::grade_competency_in_course($c1, $u3->id, $comp1->get('id'), 3, 'Unit test'); + api::grade_competency_in_course($c1, $u3->id, $comp2->get('id'), 3, 'Unit test'); // User 4. - api::grade_competency_in_course($c1, $u4->id, $comp1->get_id(), 2, 'Unit test'); - api::grade_competency_in_course($c1, $u4->id, $comp2->get_id(), 2, 'Unit test'); + api::grade_competency_in_course($c1, $u4->id, $comp1->get('id'), 2, 'Unit test'); + api::grade_competency_in_course($c1, $u4->id, $comp2->get('id'), 2, 'Unit test'); // OK we have enough data - lets call some API functions and check for expected results. @@ -4233,18 +4233,18 @@ class core_competency_api_testcase extends advanced_testcase { $result = api::get_least_proficient_competencies_for_course($c1->id, 0, 2); // We should get 5 and 6 in repeatable order. $valid = false; - if (($comp5->get_id() == $result[0]->get_id()) || ($comp6->get_id() == $result[0]->get_id())) { + if (($comp5->get('id') == $result[0]->get('id')) || ($comp6->get('id') == $result[0]->get('id'))) { $valid = true; } $this->assertTrue($valid); $valid = false; - if (($comp5->get_id() == $result[1]->get_id()) || ($comp6->get_id() == $result[1]->get_id())) { + if (($comp5->get('id') == $result[1]->get('id')) || ($comp6->get('id') == $result[1]->get('id'))) { $valid = true; } $this->assertTrue($valid); - $expected = $result[1]->get_id(); + $expected = $result[1]->get('id'); $result = api::get_least_proficient_competencies_for_course($c1->id, 1, 1); - $this->assertEquals($result[0]->get_id(), $expected); + $this->assertEquals($result[0]->get('id'), $expected); } /** @@ -4264,113 +4264,113 @@ class core_competency_api_testcase extends advanced_testcase { $framework = $lpg->create_framework(); // Create 6 competencies. - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp6 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp6 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Link 5 out of 6 to a course. - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp2->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp3->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp4->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp5->get_id(), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp3->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp4->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp5->get('id'), 'courseid' => $c1->id)); // Put all 6 in a template. $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template(); - $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp1->get_id())); - $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp2->get_id())); - $tplc3 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp3->get_id())); - $tplc4 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp4->get_id())); - $tplc5 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp5->get_id())); - $tplc6 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp6->get_id())); + $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp1->get('id'))); + $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp2->get('id'))); + $tplc3 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp3->get('id'))); + $tplc4 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp4->get('id'))); + $tplc5 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp5->get('id'))); + $tplc6 = $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $comp6->get('id'))); // Create some plans from the template. - $p1 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u1->id)); - $p2 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u2->id)); - $p3 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u3->id)); - $p4 = $lpg->create_plan(array('templateid' => $tpl->get_id(), 'userid' => $u4->id)); + $p1 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u1->id)); + $p2 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u2->id)); + $p3 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u3->id)); + $p4 = $lpg->create_plan(array('templateid' => $tpl->get('id'), 'userid' => $u4->id)); // Rate some competencies. // User 1. - $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp1->get_id(), + $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp1->get('id'), 'proficiency' => true, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp2->get_id(), + $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp2->get('id'), 'proficiency' => true, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp3->get_id(), + $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $comp3->get('id'), 'proficiency' => true, 'grade' => 1 )); // User 2. - $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp1->get_id(), + $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp1->get('id'), 'proficiency' => false, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp2->get_id(), + $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp2->get('id'), 'proficiency' => false, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp3->get_id(), + $lpg->create_user_competency(array('userid' => $u2->id, 'competencyid' => $comp3->get('id'), 'proficiency' => false, 'grade' => 1 )); // User 3. - $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp2->get_id(), + $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp2->get('id'), 'proficiency' => false, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp3->get_id(), + $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp3->get('id'), 'proficiency' => true, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp4->get_id(), + $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp4->get('id'), 'proficiency' => false, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp5->get_id(), + $lpg->create_user_competency(array('userid' => $u3->id, 'competencyid' => $comp5->get('id'), 'proficiency' => true, 'grade' => 1 )); // User 4. - $lpg->create_user_competency(array('userid' => $u4->id, 'competencyid' => $comp3->get_id(), + $lpg->create_user_competency(array('userid' => $u4->id, 'competencyid' => $comp3->get('id'), 'proficiency' => true, 'grade' => 1 )); - $lpg->create_user_competency(array('userid' => $u4->id, 'competencyid' => $comp5->get_id(), + $lpg->create_user_competency(array('userid' => $u4->id, 'competencyid' => $comp5->get('id'), 'proficiency' => true, 'grade' => 1 )); // Complete 3 out of 4 plans. - api::complete_plan($p1->get_id()); - api::complete_plan($p2->get_id()); - api::complete_plan($p3->get_id()); + api::complete_plan($p1->get('id')); + api::complete_plan($p2->get('id')); + api::complete_plan($p3->get('id')); // OK we have enough data - lets call some API functions and check for expected results. - $result = api::count_competencies_in_template_with_no_courses($tpl->get_id()); + $result = api::count_competencies_in_template_with_no_courses($tpl->get('id')); $this->assertEquals(1, $result); - $result = api::count_plans_for_template($tpl->get_id()); + $result = api::count_plans_for_template($tpl->get('id')); $this->assertEquals(4, $result); - $result = api::count_plans_for_template($tpl->get_id(), plan::STATUS_COMPLETE); + $result = api::count_plans_for_template($tpl->get('id'), plan::STATUS_COMPLETE); $this->assertEquals(3, $result); // This counts the records of competencies in completed plans for all users with a plan from this template. - $result = api::count_user_competency_plans_for_template($tpl->get_id()); + $result = api::count_user_competency_plans_for_template($tpl->get('id')); // There should be 3 plans * 6 competencies. $this->assertEquals(18, $result); // This counts the records of proficient competencies in completed plans for all users with a plan from this template. - $result = api::count_user_competency_plans_for_template($tpl->get_id(), true); + $result = api::count_user_competency_plans_for_template($tpl->get('id'), true); // There should be 5. $this->assertEquals(5, $result); // This counts the records of not proficient competencies in completed plans for all users with a plan from this template. - $result = api::count_user_competency_plans_for_template($tpl->get_id(), false); + $result = api::count_user_competency_plans_for_template($tpl->get('id'), false); // There should be 13. $this->assertEquals(13, $result); // This lists the plans based on this template, optionally filtered by status. - $result = api::list_plans_for_template($tpl->get_id()); + $result = api::list_plans_for_template($tpl->get('id')); $this->assertEquals(4, count($result)); foreach ($result as $one) { $this->assertInstanceOf('\core_competency\plan', $one); } // This lists the plans based on this template, optionally filtered by status. - $result = api::list_plans_for_template($tpl->get_id(), plan::STATUS_COMPLETE); + $result = api::list_plans_for_template($tpl->get('id'), plan::STATUS_COMPLETE); $this->assertEquals(3, count($result)); foreach ($result as $one) { $this->assertInstanceOf('\core_competency\plan', $one); - $this->assertEquals(plan::STATUS_COMPLETE, $one->get_status()); + $this->assertEquals(plan::STATUS_COMPLETE, $one->get('status')); } - $result = api::get_least_proficient_competencies_for_template($tpl->get_id(), 0, 2); + $result = api::get_least_proficient_competencies_for_template($tpl->get('id'), 0, 2); // Our times completed counts should look like this: // - comp1 - 1 @@ -4382,10 +4382,10 @@ class core_competency_api_testcase extends advanced_testcase { // // And this is a fullstop to make CiBoT happy. $this->assertEquals(2, count($result)); - $leastarray = array($comp4->get_id(), $comp6->get_id()); + $leastarray = array($comp4->get('id'), $comp6->get('id')); foreach ($result as $one) { $this->assertInstanceOf('\core_competency\competency', $one); - $this->assertContains($one->get_id(), $leastarray); + $this->assertContains($one->get('id'), $leastarray); } } @@ -4420,7 +4420,7 @@ class core_competency_api_testcase extends advanced_testcase { // Using scale 2 in a competency. $f2 = $lpg->create_framework(); $c2 = $lpg->create_competency([ - 'competencyframeworkid' => $f2->get_id(), + 'competencyframeworkid' => $f2->get('id'), 'scaleid' => $scale2->id, 'scaleconfiguration' => json_encode([ ['scaleid' => $scale2->id], @@ -4442,7 +4442,7 @@ class core_competency_api_testcase extends advanced_testcase { ]) ]); $c3 = $lpg->create_competency([ - 'competencyframeworkid' => $f3->get_id(), + 'competencyframeworkid' => $f3->get('id'), 'scaleid' => $scale4->id, 'scaleconfiguration' => json_encode([ ['scaleid' => $scale4->id], @@ -4464,7 +4464,7 @@ class core_competency_api_testcase extends advanced_testcase { ]) ]); $c4 = $lpg->create_competency([ - 'competencyframeworkid' => $f3->get_id(), + 'competencyframeworkid' => $f3->get('id'), 'scaleid' => $scale4->id, 'scaleconfiguration' => json_encode([ ['scaleid' => $scale4->id], @@ -4484,19 +4484,19 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $uc1 = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $comp1->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $uc1 = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $comp1->get('id')]); - $ev1 = $ccg->create_evidence(['usercompetencyid' => $uc1->get_id()]); - $ev2 = $ccg->create_evidence(['usercompetencyid' => $uc1->get_id()]); + $ev1 = $ccg->create_evidence(['usercompetencyid' => $uc1->get('id')]); + $ev2 = $ccg->create_evidence(['usercompetencyid' => $uc1->get('id')]); $this->setAdminUser($u1); $this->assertEquals(2, evidence::count_records()); api::delete_evidence($ev1); $this->assertEquals(1, evidence::count_records()); - $this->assertFalse(evidence::record_exists($ev1->get_id())); - $this->assertTrue(evidence::record_exists($ev2->get_id())); + $this->assertFalse(evidence::record_exists($ev1->get('id'))); + $this->assertTrue(evidence::record_exists($ev2->get('id'))); } /** @@ -4509,9 +4509,9 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $f1 = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $uc1 = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $comp1->get_id()]); - $ev1 = $ccg->create_evidence(['usercompetencyid' => $uc1->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $uc1 = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $comp1->get('id')]); + $ev1 = $ccg->create_evidence(['usercompetencyid' => $uc1->get('id')]); $this->setUser($u1); @@ -4536,7 +4536,7 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $u2 = $dg->create_user(); $f1 = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); $p1a = $ccg->create_plan(['userid' => $u1->id, 'status' => plan::STATUS_WAITING_FOR_REVIEW]); $p1b = $ccg->create_plan(['userid' => $u1->id, 'status' => plan::STATUS_IN_REVIEW, 'reviewerid' => $reviewer->id]); $p1c = $ccg->create_plan(['userid' => $u1->id, 'status' => plan::STATUS_DRAFT]); @@ -4550,17 +4550,17 @@ class core_competency_api_testcase extends advanced_testcase { $this->setUser($reviewer); $result = api::list_plans_to_review(); $this->assertEquals(3, $result['count']); - $this->assertEquals($p1a->get_id(), $result['plans'][0]->plan->get_id()); - $this->assertEquals($p1b->get_id(), $result['plans'][1]->plan->get_id()); - $this->assertEquals($p2a->get_id(), $result['plans'][2]->plan->get_id()); + $this->assertEquals($p1a->get('id'), $result['plans'][0]->plan->get('id')); + $this->assertEquals($p1b->get('id'), $result['plans'][1]->plan->get('id')); + $this->assertEquals($p2a->get('id'), $result['plans'][2]->plan->get('id')); // The reviewer cannot view the plans when they do not have the permission in the user's context. role_assign($roleprohibit, $reviewer->id, context_user::instance($u2->id)->id); accesslib_clear_all_caches_for_unit_testing(); $result = api::list_plans_to_review(); $this->assertEquals(2, $result['count']); - $this->assertEquals($p1a->get_id(), $result['plans'][0]->plan->get_id()); - $this->assertEquals($p1b->get_id(), $result['plans'][1]->plan->get_id()); + $this->assertEquals($p1a->get('id'), $result['plans'][0]->plan->get('id')); + $this->assertEquals($p1b->get('id'), $result['plans'][1]->plan->get('id')); } public function test_list_user_competencies_to_review() { @@ -4581,36 +4581,36 @@ class core_competency_api_testcase extends advanced_testcase { $u1 = $dg->create_user(); $u2 = $dg->create_user(); $f1 = $ccg->create_framework(); - $c1 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $c2 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $c3 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $uc1a = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c1->get_id(), + $c1 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $c2 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $c3 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $uc1a = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c1->get('id'), 'status' => user_competency::STATUS_IDLE]); - $uc1b = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c2->get_id(), + $uc1b = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c2->get('id'), 'status' => user_competency::STATUS_WAITING_FOR_REVIEW]); - $uc1c = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c3->get_id(), + $uc1c = $ccg->create_user_competency(['userid' => $u1->id, 'competencyid' => $c3->get('id'), 'status' => user_competency::STATUS_IN_REVIEW, 'reviewerid' => $reviewer->id]); - $uc2a = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c1->get_id(), + $uc2a = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c1->get('id'), 'status' => user_competency::STATUS_WAITING_FOR_REVIEW]); - $uc2b = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c2->get_id(), + $uc2b = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c2->get('id'), 'status' => user_competency::STATUS_IDLE]); - $uc2c = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c3->get_id(), + $uc2c = $ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $c3->get('id'), 'status' => user_competency::STATUS_IN_REVIEW]); // The reviewer can review all plans waiting for review, or in review where they are the reviewer. $this->setUser($reviewer); $result = api::list_user_competencies_to_review(); $this->assertEquals(3, $result['count']); - $this->assertEquals($uc2a->get_id(), $result['competencies'][0]->usercompetency->get_id()); - $this->assertEquals($uc1b->get_id(), $result['competencies'][1]->usercompetency->get_id()); - $this->assertEquals($uc1c->get_id(), $result['competencies'][2]->usercompetency->get_id()); + $this->assertEquals($uc2a->get('id'), $result['competencies'][0]->usercompetency->get('id')); + $this->assertEquals($uc1b->get('id'), $result['competencies'][1]->usercompetency->get('id')); + $this->assertEquals($uc1c->get('id'), $result['competencies'][2]->usercompetency->get('id')); // The reviewer cannot view the plans when they do not have the permission in the user's context. role_assign($roleprohibit, $reviewer->id, context_user::instance($u2->id)->id); accesslib_clear_all_caches_for_unit_testing(); $result = api::list_user_competencies_to_review(); $this->assertEquals(2, $result['count']); - $this->assertEquals($uc1b->get_id(), $result['competencies'][0]->usercompetency->get_id()); - $this->assertEquals($uc1c->get_id(), $result['competencies'][1]->usercompetency->get_id()); + $this->assertEquals($uc1b->get('id'), $result['competencies'][0]->usercompetency->get('id')); + $this->assertEquals($uc1c->get('id'), $result['competencies'][1]->usercompetency->get('id')); } } diff --git a/competency/tests/competency_rule_test.php b/competency/tests/competency_rule_test.php index 950e25531ed..f4602c1cf0a 100644 --- a/competency/tests/competency_rule_test.php +++ b/competency/tests/competency_rule_test.php @@ -50,31 +50,31 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test // Set up the framework and competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c11 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id(), + $c11 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c111 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c11->get_id(), + $c111 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c11->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c112 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c11->get_id(), + $c112 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c11->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c12 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id(), + $c12 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c13 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id(), + $c13 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); - $c131 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c13->get_id(), + $c131 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c13->get('id'), 'ruletype' => 'core_competency\competency_rule_all')); // Create some user competency records. - $uc1 = $lpg->create_user_competency(array('competencyid' => $c1->get_id(), 'userid' => $u1->id)); - $uc11 = $lpg->create_user_competency(array('competencyid' => $c11->get_id(), 'userid' => $u1->id, + $uc1 = $lpg->create_user_competency(array('competencyid' => $c1->get('id'), 'userid' => $u1->id)); + $uc11 = $lpg->create_user_competency(array('competencyid' => $c11->get('id'), 'userid' => $u1->id, 'grade' => 1, 'proficiency' => 1)); - $uc111 = $lpg->create_user_competency(array('competencyid' => $c111->get_id(), 'userid' => $u1->id, + $uc111 = $lpg->create_user_competency(array('competencyid' => $c111->get('id'), 'userid' => $u1->id, 'grade' => 1, 'proficiency' => 1)); - $uc112 = $lpg->create_user_competency(array('competencyid' => $c112->get_id(), 'userid' => $u1->id, + $uc112 = $lpg->create_user_competency(array('competencyid' => $c112->get('id'), 'userid' => $u1->id, 'grade' => 1, 'proficiency' => 1)); - $uc12 = $lpg->create_user_competency(array('competencyid' => $c12->get_id(), 'userid' => $u1->id)); - $uc13 = new user_competency(0, (object) array('userid' => $u1->id, 'competencyid' => $c13->get_id())); + $uc12 = $lpg->create_user_competency(array('competencyid' => $c12->get('id'), 'userid' => $u1->id)); + $uc13 = new user_competency(0, (object) array('userid' => $u1->id, 'competencyid' => $c13->get('id'))); // Not all children are met. $cr = new competency_rule_all($c1); @@ -100,13 +100,13 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); $framework2 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $cx = $lpg->create_competency(array('competencyframeworkid' => $framework2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $cx = $lpg->create_competency(array('competencyframeworkid' => $framework2->get('id'))); - $c1->set_ruletype('core_competency\competency_rule_points'); + $c1->set('ruletype', 'core_competency\competency_rule_points'); $rule = new competency_rule_points($c1); // Invalid config. @@ -117,8 +117,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array(), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -127,8 +127,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 'abc'), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -137,8 +137,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 0), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -147,8 +147,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 3), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -157,8 +157,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 1), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -167,8 +167,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 1), 'competencies' => array( - array('id' => $c1->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c1->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -177,8 +177,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 1), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => -1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => -1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -195,9 +195,9 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 1), 'competencies' => array( - array('id' => $c1->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c2->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $c1->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c2->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -206,8 +206,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 1), 'competencies' => array( - array('id' => $cx->get_id(), 'points' => 1, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 1, 'required' => 0), + array('id' => $cx->get('id'), 'points' => 1, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 1, 'required' => 0), ) )); $this->assertFalse($rule->validate_config($config)); @@ -216,8 +216,8 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test $config = json_encode(array( 'base' => array('points' => 4), 'competencies' => array( - array('id' => $c2->get_id(), 'points' => 3, 'required' => 0), - array('id' => $c3->get_id(), 'points' => 2, 'required' => 1), + array('id' => $c2->get('id'), 'points' => 3, 'required' => 0), + array('id' => $c3->get('id'), 'points' => 2, 'required' => 1), ) )); $this->assertTrue($rule->validate_config($config)); @@ -232,39 +232,39 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test // Set up the framework and competencies. $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c1->set_ruletype('core_competency\competency_rule_points'); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c1->set('ruletype', 'core_competency\competency_rule_points'); $comprule = new competency_rule_points($c1); - $c11 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c12 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c13 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c14 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); + $c11 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c12 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c13 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c14 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); // Create some user competency records. - $uc1 = $lpg->create_user_competency(array('competencyid' => $c1->get_id(), 'userid' => $u1->id)); - $uc11 = $lpg->create_user_competency(array('competencyid' => $c11->get_id(), 'userid' => $u1->id, + $uc1 = $lpg->create_user_competency(array('competencyid' => $c1->get('id'), 'userid' => $u1->id)); + $uc11 = $lpg->create_user_competency(array('competencyid' => $c11->get('id'), 'userid' => $u1->id, 'grade' => 1, 'proficiency' => 1)); - $uc12 = $lpg->create_user_competency(array('competencyid' => $c12->get_id(), 'userid' => $u1->id, + $uc12 = $lpg->create_user_competency(array('competencyid' => $c12->get('id'), 'userid' => $u1->id, 'grade' => 1, 'proficiency' => 1)); - $uc13 = $lpg->create_user_competency(array('competencyid' => $c13->get_id(), 'userid' => $u1->id)); + $uc13 = $lpg->create_user_competency(array('competencyid' => $c13->get('id'), 'userid' => $u1->id)); // Enough points. $rule = array( 'base' => array('points' => 8), 'competencies' => array( array( - 'id' => $c11->get_id(), + 'id' => $c11->get('id'), 'points' => 4, 'required' => 0 ), array( - 'id' => $c12->get_id(), + 'id' => $c12->get('id'), 'points' => 4, 'required' => 0 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertTrue($comprule->matches($uc1)); @@ -273,18 +273,18 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test 'base' => array('points' => 8), 'competencies' => array( array( - 'id' => $c11->get_id(), + 'id' => $c11->get('id'), 'points' => 4, 'required' => 0 ), array( - 'id' => $c13->get_id(), + 'id' => $c13->get('id'), 'points' => 4, 'required' => 0 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertFalse($comprule->matches($uc1)); @@ -293,23 +293,23 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test 'base' => array('points' => 8), 'competencies' => array( array( - 'id' => $c11->get_id(), + 'id' => $c11->get('id'), 'points' => 4, 'required' => 0 ), array( - 'id' => $c12->get_id(), + 'id' => $c12->get('id'), 'points' => 4, 'required' => 0 ), array( - 'id' => $c13->get_id(), + 'id' => $c13->get('id'), 'points' => 4, 'required' => 1 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertFalse($comprule->matches($uc1)); @@ -318,18 +318,18 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test 'base' => array('points' => 8), 'competencies' => array( array( - 'id' => $c11->get_id(), + 'id' => $c11->get('id'), 'points' => 4, 'required' => 0 ), array( - 'id' => $c12->get_id(), + 'id' => $c12->get('id'), 'points' => 4, 'required' => 1 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertTrue($comprule->matches($uc1)); @@ -338,18 +338,18 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test 'base' => array('points' => 8), 'competencies' => array( array( - 'id' => $c11->get_id(), + 'id' => $c11->get('id'), 'points' => 4, 'required' => 1 ), array( - 'id' => $c12->get_id(), + 'id' => $c12->get('id'), 'points' => 4, 'required' => 1 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertTrue($comprule->matches($uc1)); @@ -358,18 +358,18 @@ class core_competency_competency_rule_testcase extends externallib_advanced_test 'base' => array('points' => 4), 'competencies' => array( array( - 'id' => $c12->get_id(), + 'id' => $c12->get('id'), 'points' => 4, 'required' => 1 ), array( - 'id' => $c14->get_id(), + 'id' => $c14->get('id'), 'points' => 4, 'required' => 1 ), ) ); - $c1->set_ruleconfig(json_encode($rule)); + $c1->set('ruleconfig', json_encode($rule)); $c1->update(); $this->assertFalse($comprule->matches($uc1)); } diff --git a/competency/tests/competency_test.php b/competency/tests/competency_test.php index caff731e9a5..929ecf07126 100644 --- a/competency/tests/competency_test.php +++ b/competency/tests/competency_test.php @@ -45,27 +45,27 @@ class core_competency_competency_testcase extends advanced_testcase { $f3 = $ccg->create_framework(); $f4 = $ccg->create_framework(); - $f1c1 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $f1c11 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id(), 'parentid' => $f1c1->get_id()]); - $f1c111 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id(), 'parentid' => $f1c11->get_id()]); - $f1c1111 = $ccg->create_competency(['competencyframeworkid' => $f1->get_id(), 'parentid' => $f1c111->get_id()]); + $f1c1 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $f1c11 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id'), 'parentid' => $f1c1->get('id')]); + $f1c111 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id'), 'parentid' => $f1c11->get('id')]); + $f1c1111 = $ccg->create_competency(['competencyframeworkid' => $f1->get('id'), 'parentid' => $f1c111->get('id')]); - $f2c1 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id()]); - $f2c2 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id()]); - $f2c21 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c2->get_id()]); - $f2c22 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c2->get_id()]); - $f2c211 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c21->get_id()]); - $f2c221 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c22->get_id()]); - $f2c222 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c22->get_id()]); - $f2c223 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id(), 'parentid' => $f2c22->get_id()]); - $f2c3 = $ccg->create_competency(['competencyframeworkid' => $f2->get_id()]); + $f2c1 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id')]); + $f2c2 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id')]); + $f2c21 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c2->get('id')]); + $f2c22 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c2->get('id')]); + $f2c211 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c21->get('id')]); + $f2c221 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c22->get('id')]); + $f2c222 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c22->get('id')]); + $f2c223 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id'), 'parentid' => $f2c22->get('id')]); + $f2c3 = $ccg->create_competency(['competencyframeworkid' => $f2->get('id')]); - $f3c1 = $ccg->create_competency(['competencyframeworkid' => $f3->get_id()]); + $f3c1 = $ccg->create_competency(['competencyframeworkid' => $f3->get('id')]); - $this->assertEquals(4, competency::get_framework_depth($f1->get_id())); - $this->assertEquals(3, competency::get_framework_depth($f2->get_id())); - $this->assertEquals(1, competency::get_framework_depth($f3->get_id())); - $this->assertEquals(0, competency::get_framework_depth($f4->get_id())); + $this->assertEquals(4, competency::get_framework_depth($f1->get('id'))); + $this->assertEquals(3, competency::get_framework_depth($f2->get('id'))); + $this->assertEquals(1, competency::get_framework_depth($f3->get('id'))); + $this->assertEquals(0, competency::get_framework_depth($f4->get('id'))); } } diff --git a/competency/tests/course_competency_settings_test.php b/competency/tests/course_competency_settings_test.php index 31f5e486c13..d1803ca68df 100644 --- a/competency/tests/course_competency_settings_test.php +++ b/competency/tests/course_competency_settings_test.php @@ -60,10 +60,10 @@ class core_competency_course_competency_settings_testcase extends advanced_testc $u3 = $dg->create_user(); $framework = $lpg->create_framework(); - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp2->get_id(), 'courseid' => $c1->id)); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c1->id)); // Enrol the user. $dg->enrol_user($u1->id, $c1->id); @@ -77,47 +77,47 @@ class core_competency_course_competency_settings_testcase extends advanced_testc set_config('pushcourseratingstouserplans', true, 'core_competency'); $coursesettings = course_competency_settings::get_by_courseid($c1->id); - $this->assertTrue((boolean)$coursesettings->get_pushratingstouserplans()); + $this->assertTrue((boolean)$coursesettings->get('pushratingstouserplans')); set_config('pushcourseratingstouserplans', false, 'core_competency'); $coursesettings = course_competency_settings::get_by_courseid($c1->id); - $this->assertFalse((boolean)$coursesettings->get_pushratingstouserplans()); + $this->assertFalse((boolean)$coursesettings->get('pushratingstouserplans')); api::update_course_competency_settings($c1->id, (object) array('pushratingstouserplans' => true)); $coursesettings = course_competency_settings::get_by_courseid($c1->id); - $this->assertTrue((boolean)$coursesettings->get_pushratingstouserplans()); + $this->assertTrue((boolean)$coursesettings->get('pushratingstouserplans')); set_config('pushcourseratingstouserplans', true, 'core_competency'); api::update_course_competency_settings($c1->id, (object) array('pushratingstouserplans' => false)); $coursesettings = course_competency_settings::get_by_courseid($c1->id); - $this->assertFalse((boolean)$coursesettings->get_pushratingstouserplans()); + $this->assertFalse((boolean)$coursesettings->get('pushratingstouserplans')); // Right now the setting is false. - api::grade_competency_in_course($c1->id, $u1->id, $comp1->get_id(), 1, 'Note'); + api::grade_competency_in_course($c1->id, $u1->id, $comp1->get('id'), 1, 'Note'); $filterparams = array( 'userid' => $u1->id, - 'competencyid' => $comp1->get_id(), + 'competencyid' => $comp1->get('id'), ); $usercompcourse = \core_competency\user_competency_course::get_record($filterparams); $usercomp = \core_competency\user_competency::get_record($filterparams); // No grade in plan - only a grade in the course. - $this->assertEmpty($usercomp->get_grade()); - $this->assertEquals(1, $usercompcourse->get_grade()); + $this->assertEmpty($usercomp->get('grade')); + $this->assertEquals(1, $usercompcourse->get('grade')); api::update_course_competency_settings($c1->id, (object) array('pushratingstouserplans' => true)); - api::grade_competency_in_course($c1->id, $u1->id, $comp1->get_id(), 2, 'Note 2'); + api::grade_competency_in_course($c1->id, $u1->id, $comp1->get('id'), 2, 'Note 2'); $filterparams = array( 'userid' => $u1->id, - 'competencyid' => $comp1->get_id(), + 'competencyid' => $comp1->get('id'), ); $usercompcourse = \core_competency\user_competency_course::get_record($filterparams); $usercomp = \core_competency\user_competency::get_record($filterparams); // Updated grade in plan - updated grade in the course. - $this->assertEquals(2, $usercomp->get_grade()); - $this->assertEquals(2, $usercompcourse->get_grade()); + $this->assertEquals(2, $usercomp->get('grade')); + $this->assertEquals(2, $usercompcourse->get('grade')); $this->setUser($u3); $this->expectException('required_capability_exception'); diff --git a/competency/tests/course_competency_test.php b/competency/tests/course_competency_test.php index 421c0ec1510..ddc2de52c2b 100644 --- a/competency/tests/course_competency_test.php +++ b/competency/tests/course_competency_test.php @@ -56,14 +56,14 @@ class core_competency_course_competency_testcase extends advanced_testcase { $flatfileinstanceid = $flatfileplugin->add_instance($c2); $framework = $lpg->create_framework(); - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); // In C1, and C2. - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); // In C2. - $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); // In None. - $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); // In C4. - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c1->id)); - $lpg->create_course_competency(array('competencyid' => $comp1->get_id(), 'courseid' => $c2->id)); - $lpg->create_course_competency(array('competencyid' => $comp2->get_id(), 'courseid' => $c2->id)); - $lpg->create_course_competency(array('competencyid' => $comp4->get_id(), 'courseid' => $c4->id)); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // In C1, and C2. + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // In C2. + $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // In None. + $comp4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // In C4. + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id)); + $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c2->id)); + $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c2->id)); + $lpg->create_course_competency(array('competencyid' => $comp4->get('id'), 'courseid' => $c4->id)); // Enrol the user 1 in C1, C2, and C3. $dg->enrol_user($u1->id, $c1->id); @@ -81,33 +81,33 @@ class core_competency_course_competency_testcase extends advanced_testcase { $dg->enrol_user($u4->id, $c2->id, null, 'flatfile'); // Using the competency that is not used anywhere -> no courses. - $this->assertCount(0, course_competency::get_courses_with_competency_and_user($comp3->get_id(), $u1->id)); + $this->assertCount(0, course_competency::get_courses_with_competency_and_user($comp3->get('id'), $u1->id)); // Using the competency that is used in a course where the user is not enrolled -> no courses. - $this->assertCount(0, course_competency::get_courses_with_competency_and_user($comp4->get_id(), $u1->id)); + $this->assertCount(0, course_competency::get_courses_with_competency_and_user($comp4->get('id'), $u1->id)); // Using the competency that is used in a course where the user is enrolled -> one course. - $courses = course_competency::get_courses_with_competency_and_user($comp2->get_id(), $u1->id); + $courses = course_competency::get_courses_with_competency_and_user($comp2->get('id'), $u1->id); $this->assertCount(1, $courses); $this->assertArrayHasKey($c2->id, $courses); // Using the competency used multiple times. - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u1->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u1->id); $this->assertCount(2, $courses); $this->assertArrayHasKey($c1->id, $courses); $this->assertArrayHasKey($c2->id, $courses); // Checking for another user where the competency is used twice, but not for them. - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u2->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u2->id); $this->assertCount(0, $courses); // Checking for another user where the competency is used in their course. - $courses = course_competency::get_courses_with_competency_and_user($comp4->get_id(), $u2->id); + $courses = course_competency::get_courses_with_competency_and_user($comp4->get('id'), $u2->id); $this->assertCount(1, $courses); $this->assertArrayHasKey($c4->id, $courses); // Checking for a user who is suspended in a course. - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u3->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u3->id); $this->assertCount(1, $courses); $this->assertArrayHasKey($c1->id, $courses); @@ -115,14 +115,14 @@ class core_competency_course_competency_testcase extends advanced_testcase { $enrolplugins = explode(',', $CFG->enrol_plugins_enabled); $enrolplugins[] = 'flatfile'; $CFG->enrol_plugins_enabled = implode(',', array_unique($enrolplugins)); - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u4->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u4->id); $this->assertCount(1, $courses); $this->assertArrayHasKey($c2->id, $courses); // Check for the user with plugin enabled, but enrolment instance disabled. $flatfileinstance = $DB->get_record('enrol', array('id' => $flatfileinstanceid)); $flatfileplugin->update_status($flatfileinstance, ENROL_INSTANCE_DISABLED); - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u4->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u4->id); $this->assertCount(0, $courses); $flatfileplugin->update_status($flatfileinstance, ENROL_INSTANCE_ENABLED); @@ -130,7 +130,7 @@ class core_competency_course_competency_testcase extends advanced_testcase { $enrolplugins = array_flip(explode(',', $CFG->enrol_plugins_enabled)); unset($enrolplugins['flatfile']); $CFG->enrol_plugins_enabled = implode(',', array_keys($enrolplugins)); - $courses = course_competency::get_courses_with_competency_and_user($comp1->get_id(), $u4->id); + $courses = course_competency::get_courses_with_competency_and_user($comp1->get('id'), $u4->id); $this->assertCount(0, $courses); } diff --git a/competency/tests/event_test.php b/competency/tests/event_test.php index 4554c29a32d..134c86b110f 100644 --- a/competency/tests/event_test.php +++ b/competency/tests/event_test.php @@ -63,8 +63,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_framework_created', $event); - $this->assertEquals($framework->get_id(), $event->objectid); - $this->assertEquals($framework->get_contextid(), $event->contextid); + $this->assertEquals($framework->get('id'), $event->objectid); + $this->assertEquals($framework->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -82,7 +82,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - api::delete_framework($framework->get_id()); + api::delete_framework($framework->get('id')); // Get our event event. $events = $sink->get_events(); @@ -90,8 +90,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_framework_deleted', $event); - $this->assertEquals($framework->get_id(), $event->objectid); - $this->assertEquals($framework->get_contextid(), $event->contextid); + $this->assertEquals($framework->get('id'), $event->objectid); + $this->assertEquals($framework->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -109,7 +109,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - $framework->set_shortname('Shortname modified'); + $framework->set('shortname', 'Shortname modified'); api::update_framework($framework->to_record()); // Get our event event. @@ -118,8 +118,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_framework_updated', $event); - $this->assertEquals($framework->get_id(), $event->objectid); - $this->assertEquals($framework->get_contextid(), $event->contextid); + $this->assertEquals($framework->get('id'), $event->objectid); + $this->assertEquals($framework->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -145,8 +145,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_framework_viewed', $event); - $this->assertEquals($framework->get_id(), $event->objectid); - $this->assertEquals($framework->get_contextid(), $event->contextid); + $this->assertEquals($framework->get('id'), $event->objectid); + $this->assertEquals($framework->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -160,7 +160,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->setAdminUser(); $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); @@ -170,7 +170,7 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_viewed', $event); - $this->assertEquals($competency->get_id(), $event->objectid); + $this->assertEquals($competency->get('id'), $event->objectid); $this->assertEquals($competency->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -193,8 +193,8 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_template_viewed', $event); - $this->assertEquals($template->get_id(), $event->objectid); - $this->assertEquals($template->get_contextid(), $event->contextid); + $this->assertEquals($template->get('id'), $event->objectid); + $this->assertEquals($template->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -222,8 +222,8 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\competency_template_created', $event); - $this->assertEquals($template->get_id(), $event->objectid); - $this->assertEquals($template->get_contextid(), $event->contextid); + $this->assertEquals($template->get('id'), $event->objectid); + $this->assertEquals($template->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -241,7 +241,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - api::delete_template($template->get_id()); + api::delete_template($template->get('id')); // Get our event event. $events = $sink->get_events(); @@ -249,8 +249,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_template_deleted', $event); - $this->assertEquals($template->get_id(), $event->objectid); - $this->assertEquals($template->get_contextid(), $event->contextid); + $this->assertEquals($template->get('id'), $event->objectid); + $this->assertEquals($template->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -268,7 +268,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - $template->set_shortname('Shortname modified'); + $template->set('shortname', 'Shortname modified'); api::update_template($template->to_record()); // Get our event event. @@ -277,8 +277,8 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_template_updated', $event); - $this->assertEquals($template->get_id(), $event->objectid); - $this->assertEquals($template->get_contextid(), $event->contextid); + $this->assertEquals($template->get('id'), $event->objectid); + $this->assertEquals($template->get('contextid'), $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -293,15 +293,15 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $competency = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); - $c13 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); + $competency = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); + $c13 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); - $competency->set_shortname('Shortname modified'); + $competency->set('shortname', 'Shortname modified'); api::update_competency($competency->to_record()); // Get our event event. @@ -310,7 +310,7 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_updated', $event); - $this->assertEquals($competency->get_id(), $event->objectid); + $this->assertEquals($competency->get('id'), $event->objectid); $this->assertEquals($competency->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -326,7 +326,7 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $record = $c1->to_record(); $record->id = 0; $record->idnumber = 'comp idnumber'; @@ -341,7 +341,7 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\competency_created', $event); - $this->assertEquals($competency->get_id(), $event->objectid); + $this->assertEquals($competency->get('id'), $event->objectid); $this->assertEquals($competency->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -357,14 +357,14 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); // Create framework should trigger a created event for competencies. - api::duplicate_framework($f1->get_id()); + api::duplicate_framework($f1->get('id')); // Get our event event. $events = $sink->get_events(); @@ -393,8 +393,8 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1id = $c1->get_id(); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1id = $c1->get('id'); $contextid = $c1->get_context()->id; // Trigger and capture the event. @@ -423,14 +423,14 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'parentid' => $c1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c12 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'parentid' => $c1->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); // Delete framework should trigger a deleted event for competencies. - api::delete_framework($f1->get_id()); + api::delete_framework($f1->get('id')); // Get our event event. $events = $sink->get_events(); @@ -471,7 +471,7 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_plan_created', $event); - $this->assertEquals($plan->get_id(), $event->objectid); + $this->assertEquals($plan->get('id'), $event->objectid); $this->assertEquals($plan->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -494,14 +494,14 @@ class core_competency_event_testcase extends advanced_testcase { cohort_add_member($c1->id, $user2->id); $t1 = $lpg->create_template(); $tc = $lpg->create_template_cohort(array( - 'templateid' => $t1->get_id(), + 'templateid' => $t1->get('id'), 'cohortid' => $c1->id )); // Trigger and capture the event. $sink = $this->redirectEvents(); - api::create_plans_from_template_cohort($t1->get_id(), $c1->id); + api::create_plans_from_template_cohort($t1->get('id'), $c1->id); // Get our event event. - $plans = core_competency\plan::get_records(array('templateid' => $t1->get_id()), 'id'); + $plans = core_competency\plan::get_records(array('templateid' => $t1->get('id')), 'id'); $events = $sink->get_events(); $this->assertCount(2, $events); $this->assertCount(2, $plans); @@ -509,12 +509,12 @@ class core_competency_event_testcase extends advanced_testcase { $plan = $plans[0]; // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_plan_created', $event); - $this->assertEquals($plan->get_id(), $event->objectid); + $this->assertEquals($plan->get('id'), $event->objectid); $this->assertEquals($plan->get_context()->id, $event->contextid); $event = $events[1]; $plan = $plans[1]; $this->assertInstanceOf('\core\event\competency_plan_created', $event); - $this->assertEquals($plan->get_id(), $event->objectid); + $this->assertEquals($plan->get('id'), $event->objectid); $this->assertEquals($plan->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -536,13 +536,13 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); $plan = api::update_plan($record); - $this->assertEquals('Plan updated', $plan->get_name()); + $this->assertEquals('Plan updated', $plan->get('name')); // Get our event event. $events = $sink->get_events(); $event = reset($events); $this->assertInstanceOf('\core\event\competency_plan_updated', $event); - $this->assertEquals($plan->get_id(), $event->objectid); + $this->assertEquals($plan->get('id'), $event->objectid); $this->assertEquals($plan->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -559,11 +559,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::delete_plan($plan->get_id()); + $result = api::delete_plan($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -594,7 +594,7 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_plan_viewed', $event); - $this->assertEquals($plan->get_id(), $event->objectid); + $this->assertEquals($plan->get('id'), $event->objectid); $this->assertEquals($plan->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -625,7 +625,7 @@ class core_competency_event_testcase extends advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\competency_user_evidence_created', $event); - $this->assertEquals($userevidence->get_id(), $event->objectid); + $this->assertEquals($userevidence->get('id'), $event->objectid); $this->assertEquals($userevidence->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -646,7 +646,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - api::delete_user_evidence($userevidence->get_id()); + api::delete_user_evidence($userevidence->get('id')); // Get our event event. $events = $sink->get_events(); @@ -654,7 +654,7 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_evidence_deleted', $event); - $this->assertEquals($userevidence->get_id(), $event->objectid); + $this->assertEquals($userevidence->get('id'), $event->objectid); $this->assertEquals($userevidence->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -675,7 +675,7 @@ class core_competency_event_testcase extends advanced_testcase { // Trigger and capture the event. $sink = $this->redirectEvents(); - $userevidence->set_name('Name modified'); + $userevidence->set('name', 'Name modified'); api::update_user_evidence($userevidence->to_record()); // Get our event event. @@ -684,7 +684,7 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_evidence_updated', $event); - $this->assertEquals($userevidence->get_id(), $event->objectid); + $this->assertEquals($userevidence->get('id'), $event->objectid); $this->assertEquals($userevidence->get_context()->id, $event->contextid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -702,15 +702,15 @@ class core_competency_event_testcase extends advanced_testcase { $user = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user->id)); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); - $pc = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c->get_id())); - $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c->get_id())); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); + $pc = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c->get('id'))); + $uc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c->get('id'))); // Can not log the event for user competency using completed plan. api::complete_plan($plan); try { - api::user_competency_viewed_in_plan($uc, $plan->get_id()); + api::user_competency_viewed_in_plan($uc, $plan->get('id')); $this->fail('To log the user competency in completed plan ' . 'use user_competency_plan_viewed method.'); } catch (coding_exception $e) { @@ -721,7 +721,7 @@ class core_competency_event_testcase extends advanced_testcase { api::reopen_plan($plan); // Trigger and capture the event. $sink = $this->redirectEvents(); - api::user_competency_viewed_in_plan($uc, $plan->get_id()); + api::user_competency_viewed_in_plan($uc, $plan->get('id')); // Get our event event. $events = $sink->get_events(); @@ -729,18 +729,18 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_competency_viewed_in_plan', $event); - $this->assertEquals($uc->get_id(), $event->objectid); + $this->assertEquals($uc->get('id'), $event->objectid); $this->assertEquals($uc->get_context()->id, $event->contextid); - $this->assertEquals($uc->get_userid(), $event->relateduserid); - $this->assertEquals($plan->get_id(), $event->other['planid']); - $this->assertEquals($c->get_id(), $event->other['competencyid']); + $this->assertEquals($uc->get('userid'), $event->relateduserid); + $this->assertEquals($plan->get('id'), $event->other['planid']); + $this->assertEquals($c->get('id'), $event->other['competencyid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); // Test validation. $params = array ( - 'objectid' => $uc->get_id(), + 'objectid' => $uc->get('id'), 'contextid' => $uc->get_context()->id, 'other' => null ); @@ -762,7 +762,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage()); } - $params['other']['competencyid'] = $c->get_id(); + $params['other']['competencyid'] = $c->get('id'); // Missing planid. try { \core\event\competency_user_competency_viewed_in_plan::create($params)->trigger(); @@ -784,9 +784,9 @@ class core_competency_event_testcase extends advanced_testcase { $user = $dg->create_user(); $course = $dg->create_course(); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); - $pc = $lpg->create_course_competency(array('courseid' => $course->id, 'competencyid' => $c->get_id())); - $params = array('userid' => $user->id, 'competencyid' => $c->get_id(), 'courseid' => $course->id); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); + $pc = $lpg->create_course_competency(array('courseid' => $course->id, 'competencyid' => $c->get('id'))); + $params = array('userid' => $user->id, 'competencyid' => $c->get('id'), 'courseid' => $course->id); $ucc = $lpg->create_user_competency_course($params); // Trigger and capture the event. @@ -799,18 +799,18 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_competency_viewed_in_course', $event); - $this->assertEquals($ucc->get_id(), $event->objectid); + $this->assertEquals($ucc->get('id'), $event->objectid); $this->assertEquals(context_course::instance($course->id)->id, $event->contextid); - $this->assertEquals($ucc->get_userid(), $event->relateduserid); + $this->assertEquals($ucc->get('userid'), $event->relateduserid); $this->assertEquals($course->id, $event->courseid); - $this->assertEquals($c->get_id(), $event->other['competencyid']); + $this->assertEquals($c->get('id'), $event->other['competencyid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); // Test validation. $params = array ( - 'objectid' => $ucc->get_id(), + 'objectid' => $ucc->get('id'), 'contextid' => $ucc->get_context()->id, 'other' => null ); @@ -846,11 +846,11 @@ class core_competency_event_testcase extends advanced_testcase { $user = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user->id)); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); $ucp = $lpg->create_user_competency_plan(array( 'userid' => $user->id, - 'competencyid' => $c->get_id(), - 'planid' => $plan->get_id() + 'competencyid' => $c->get('id'), + 'planid' => $plan->get('id') )); // Can not log the event for user competency using non completed plan. @@ -876,18 +876,18 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_competency_plan_viewed', $event); - $this->assertEquals($ucp->get_id(), $event->objectid); + $this->assertEquals($ucp->get('id'), $event->objectid); $this->assertEquals($ucp->get_context()->id, $event->contextid); - $this->assertEquals($ucp->get_userid(), $event->relateduserid); - $this->assertEquals($plan->get_id(), $event->other['planid']); - $this->assertEquals($c->get_id(), $event->other['competencyid']); + $this->assertEquals($ucp->get('userid'), $event->relateduserid); + $this->assertEquals($plan->get('id'), $event->other['planid']); + $this->assertEquals($c->get('id'), $event->other['competencyid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); // Test validation. $params = array ( - 'objectid' => $ucp->get_id(), + 'objectid' => $ucp->get('id'), 'contextid' => $ucp->get_context()->id, 'other' => null ); @@ -909,7 +909,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage()); } - $params['other']['competencyid'] = $c->get_id(); + $params['other']['competencyid'] = $c->get('id'); // Missing planid. try { \core\event\competency_user_competency_plan_viewed::create($params)->trigger(); @@ -930,10 +930,10 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user = $dg->create_user(); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id() + 'competencyid' => $c->get('id') )); // Trigger and capture the event. @@ -946,17 +946,17 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_user_competency_viewed', $event); - $this->assertEquals($uc->get_id(), $event->objectid); + $this->assertEquals($uc->get('id'), $event->objectid); $this->assertEquals($uc->get_context()->id, $event->contextid); - $this->assertEquals($uc->get_userid(), $event->relateduserid); - $this->assertEquals($c->get_id(), $event->other['competencyid']); + $this->assertEquals($uc->get('userid'), $event->relateduserid); + $this->assertEquals($c->get('id'), $event->other['competencyid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); // Test validation. $params = array ( - 'objectid' => $uc->get_id(), + 'objectid' => $uc->get('id'), 'contextid' => $uc->get_context()->id ); @@ -980,11 +980,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::approve_plan($plan->get_id()); + $result = api::approve_plan($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -992,7 +992,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_approved', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1008,11 +1008,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_ACTIVE)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::unapprove_plan($plan->get_id()); + $result = api::unapprove_plan($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1020,7 +1020,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_unapproved', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1036,11 +1036,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_COMPLETE)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::reopen_plan($plan->get_id()); + $result = api::reopen_plan($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1048,7 +1048,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_reopened', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1064,11 +1064,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_ACTIVE)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::complete_plan($plan->get_id()); + $result = api::complete_plan($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1076,7 +1076,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_completed', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1095,13 +1095,13 @@ class core_competency_event_testcase extends advanced_testcase { $plan = $lpg->create_plan(array( 'userid' => $user1->id, 'status' => \core_competency\plan::STATUS_ACTIVE, - 'templateid' => $template->get_id() + 'templateid' => $template->get('id') )); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::unlink_plan_from_template($plan->get_id()); + $result = api::unlink_plan_from_template($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1109,7 +1109,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_unlinked', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1125,11 +1125,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::plan_request_review($plan->get_id()); + $result = api::plan_request_review($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1137,7 +1137,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_review_requested', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1153,11 +1153,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_WAITING_FOR_REVIEW)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::plan_cancel_review_request($plan->get_id()); + $result = api::plan_cancel_review_request($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1165,7 +1165,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_review_request_cancelled', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1181,11 +1181,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_WAITING_FOR_REVIEW)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::plan_start_review($plan->get_id()); + $result = api::plan_start_review($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1193,7 +1193,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_review_started', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1209,11 +1209,11 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user1 = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_IN_REVIEW)); - $planid = $plan->get_id(); + $planid = $plan->get('id'); $contextid = $plan->get_context()->id; // Trigger and capture the event. $sink = $this->redirectEvents(); - $result = api::plan_stop_review($plan->get_id()); + $result = api::plan_stop_review($plan->get('id')); $this->assertTrue($result); // Get our event event. $events = $sink->get_events(); @@ -1221,7 +1221,7 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_plan_review_stopped', $event); $this->assertEquals($planid, $event->objectid); $this->assertEquals($contextid, $event->contextid); - $this->assertEquals($plan->get_userid(), $event->relateduserid); + $this->assertEquals($plan->get('userid'), $event->relateduserid); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1241,7 +1241,7 @@ class core_competency_event_testcase extends advanced_testcase { $cmt = new stdClass(); $cmt->context = $context; $cmt->area = 'plan'; - $cmt->itemid = $plan->get_id(); + $cmt->itemid = $plan->get('id'); $cmt->component = 'competency'; $cmt->showcount = 1; $manager = new comment($cmt); @@ -1258,7 +1258,7 @@ class core_competency_event_testcase extends advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\core\event\competency_comment_created', $event); $this->assertEquals($context, $event->get_context()); - $this->assertEquals($plan->get_id(), $event->other['itemid']); + $this->assertEquals($plan->get('id'), $event->other['itemid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1279,7 +1279,7 @@ class core_competency_event_testcase extends advanced_testcase { $cmt = new stdClass(); $cmt->context = $context; $cmt->area = 'plan'; - $cmt->itemid = $plan->get_id(); + $cmt->itemid = $plan->get('id'); $cmt->component = 'competency'; $manager = new comment($cmt); $newcomment = $manager->add("Comment to be deleted"); @@ -1294,7 +1294,7 @@ class core_competency_event_testcase extends advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\core\event\competency_comment_deleted', $event); $this->assertEquals($context, $event->get_context()); - $this->assertEquals($plan->get_id(), $event->other['itemid']); + $this->assertEquals($plan->get('id'), $event->other['itemid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1315,7 +1315,7 @@ class core_competency_event_testcase extends advanced_testcase { // Create a competency for the course. $lpg = $dg->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get('id')]); // Trigger and capture the event. $sink = $this->redirectEvents(); @@ -1331,24 +1331,24 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_evidence_created', $event); - $this->assertEquals($evidence->get_contextid(), $event->contextid); - $this->assertEquals($evidence->get_id(), $event->objectid); - $this->assertEquals($evidence->get_actionuserid(), $event->userid); + $this->assertEquals($evidence->get('contextid'), $event->contextid); + $this->assertEquals($evidence->get('id'), $event->objectid); + $this->assertEquals($evidence->get('actionuserid'), $event->userid); $this->assertEquals($student->id, $event->relateduserid); - $this->assertEquals($evidence->get_usercompetencyid(), $event->other['usercompetencyid']); - $this->assertEquals($comp->get_id(), $event->other['competencyid']); - $this->assertEquals($evidence->get_action(), $event->other['action']); + $this->assertEquals($evidence->get('usercompetencyid'), $event->other['usercompetencyid']); + $this->assertEquals($comp->get('id'), $event->other['competencyid']); + $this->assertEquals($evidence->get('action'), $event->other['action']); $this->assertEquals($recommend, $event->other['recommend']); // Test get_name(). $this->assertEquals(get_string('eventevidencecreated', 'core_competency'), $event->get_name()); // Test get_description(). - $description = "The user with id '$USER->id' created an evidence with id '{$evidence->get_id()}'."; + $description = "The user with id '$USER->id' created an evidence with id '{$evidence->get('id')}'."; $this->assertEquals($description, $event->get_description()); // Test get_url(). - $url = url::user_competency($evidence->get_usercompetencyid()); + $url = url::user_competency($evidence->get('usercompetencyid')); $this->assertEquals($url, $event->get_url()); // Test get_objectid_mapping(). @@ -1376,10 +1376,10 @@ class core_competency_event_testcase extends advanced_testcase { // Create a competency for the course. $lpg = $dg->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get('id')]); // Create a different user competency. - $otheruc = \core_competency\user_competency::create_relation($student2->id, $comp->get_id()); + $otheruc = \core_competency\user_competency::create_relation($student2->id, $comp->get('id')); $otheruc->create(); // Add evidence. @@ -1474,7 +1474,7 @@ class core_competency_event_testcase extends advanced_testcase { $scaleconfig[] = array('name' => 'D', 'id' => 4, 'scaledefault' => 0, 'proficient' => 1); $fr = $lpg->create_framework(); $c = $lpg->create_competency(array( - 'competencyframeworkid' => $fr->get_id(), + 'competencyframeworkid' => $fr->get('id'), 'scaleid' => $scale->id, 'scaleconfiguration' => $scaleconfig )); @@ -1482,11 +1482,11 @@ class core_competency_event_testcase extends advanced_testcase { $user = $dg->create_user(); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id())); + 'competencyid' => $c->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); - api::grade_competency($user->id, $c->get_id(), 2, true); + api::grade_competency($user->id, $c->get('id'), 2, true); // Get our event event. $events = $sink->get_events(); @@ -1498,9 +1498,9 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_evidence_created', $evidencecreatedevent); $this->assertInstanceOf('\core\event\competency_user_competency_rated', $event); - $this->assertEquals($uc->get_id(), $event->objectid); + $this->assertEquals($uc->get('id'), $event->objectid); $this->assertEquals($uc->get_context()->id, $event->contextid); - $this->assertEquals($uc->get_userid(), $event->relateduserid); + $this->assertEquals($uc->get('userid'), $event->relateduserid); $this->assertEquals(2, $event->other['grade']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -1527,7 +1527,7 @@ class core_competency_event_testcase extends advanced_testcase { $scaleconfig[] = array('name' => 'D', 'id' => 4, 'scaledefault' => 0, 'proficient' => 1); $fr = $lpg->create_framework(); $c = $lpg->create_competency(array( - 'competencyframeworkid' => $fr->get_id(), + 'competencyframeworkid' => $fr->get('id'), 'scaleid' => $scale->id, 'scaleconfiguration' => $scaleconfig )); @@ -1535,14 +1535,14 @@ class core_competency_event_testcase extends advanced_testcase { $dg->enrol_user($user->id, $course->id, $studentrole->id); $lpg->create_course_competency(array( 'courseid' => $course->id, - 'competencyid' => $c->get_id())); + 'competencyid' => $c->get('id'))); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id())); + 'competencyid' => $c->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); - api::grade_competency_in_course($course->id, $user->id, $c->get_id(), 2, true); + api::grade_competency_in_course($course->id, $user->id, $c->get('id'), 2, true); // Get our event event. $events = $sink->get_events(); @@ -1556,8 +1556,8 @@ class core_competency_event_testcase extends advanced_testcase { $this->assertInstanceOf('\core\event\competency_user_competency_rated_in_course', $event); $this->assertEquals(context_course::instance($course->id)->id, $event->contextid); $this->assertEquals($course->id, $event->courseid); - $this->assertEquals($uc->get_userid(), $event->relateduserid); - $this->assertEquals($uc->get_competencyid(), $event->other['competencyid']); + $this->assertEquals($uc->get('userid'), $event->relateduserid); + $this->assertEquals($uc->get('competencyid'), $event->other['competencyid']); $this->assertEquals(2, $event->other['grade']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -1582,18 +1582,18 @@ class core_competency_event_testcase extends advanced_testcase { $plan = $lpg->create_plan(array('userid' => $user->id)); $fr = $lpg->create_framework(); $c = $lpg->create_competency(array( - 'competencyframeworkid' => $fr->get_id(), + 'competencyframeworkid' => $fr->get('id'), 'scaleid' => $scale->id, 'scaleconfiguration' => $scaleconfig )); - $pc = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c->get_id())); + $pc = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c->get('id'))); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id())); + 'competencyid' => $c->get('id'))); // Trigger and capture the event. $sink = $this->redirectEvents(); - api::grade_competency_in_plan($plan->get_id(), $c->get_id(), 3, true); + api::grade_competency_in_plan($plan->get('id'), $c->get('id'), 3, true); // Get our event event. $events = $sink->get_events(); @@ -1605,10 +1605,10 @@ class core_competency_event_testcase extends advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\competency_evidence_created', $evidencecreatedevent); $this->assertInstanceOf('\core\event\competency_user_competency_rated_in_plan', $event); - $this->assertEquals($uc->get_id(), $event->objectid); + $this->assertEquals($uc->get('id'), $event->objectid); $this->assertEquals($uc->get_context()->id, $event->contextid); - $this->assertEquals($uc->get_userid(), $event->relateduserid); - $this->assertEquals($uc->get_competencyid(), $event->other['competencyid']); + $this->assertEquals($uc->get('userid'), $event->relateduserid); + $this->assertEquals($uc->get('competencyid'), $event->other['competencyid']); $this->assertEquals(3, $event->other['grade']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); @@ -1625,17 +1625,17 @@ class core_competency_event_testcase extends advanced_testcase { $user = $dg->create_user(); $this->setUser($user); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id() + 'competencyid' => $c->get('id') )); $context = context_user::instance($user->id); $cmt = new stdClass(); $cmt->context = $context; $cmt->area = 'user_competency'; - $cmt->itemid = $uc->get_id(); + $cmt->itemid = $uc->get('id'); $cmt->component = 'competency'; $cmt->showcount = 1; $manager = new comment($cmt); @@ -1651,7 +1651,7 @@ class core_competency_event_testcase extends advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\core\event\competency_comment_created', $event); $this->assertEquals($context, $event->get_context()); - $this->assertEquals($uc->get_id(), $event->other['itemid']); + $this->assertEquals($uc->get('id'), $event->other['itemid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } @@ -1666,17 +1666,17 @@ class core_competency_event_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $user = $dg->create_user(); $fr = $lpg->create_framework(); - $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id())); + $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get('id'))); $uc = $lpg->create_user_competency(array( 'userid' => $user->id, - 'competencyid' => $c->get_id() + 'competencyid' => $c->get('id') )); $context = context_user::instance($user->id); $cmt = new stdClass(); $cmt->context = $context; $cmt->area = 'user_competency'; - $cmt->itemid = $uc->get_id(); + $cmt->itemid = $uc->get('id'); $cmt->component = 'competency'; $manager = new comment($cmt); $newcomment = $manager->add("Comment to be deleted"); @@ -1691,7 +1691,7 @@ class core_competency_event_testcase extends advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\core\event\competency_comment_deleted', $event); $this->assertEquals($context, $event->get_context()); - $this->assertEquals($uc->get_id(), $event->other['itemid']); + $this->assertEquals($uc->get('id'), $event->other['itemid']); $this->assertEventContextNotUsed($event); $this->assertDebuggingNotCalled(); } diff --git a/competency/tests/external_test.php b/competency/tests/external_test.php index fcf7177a936..f8a09e0edfc 100644 --- a/competency/tests/external_test.php +++ b/competency/tests/external_test.php @@ -603,23 +603,23 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $f1 = $lpg->create_framework(array('scaleid' => $s1->id)); $f2 = $lpg->create_framework(array('scaleid' => $s1->id)); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); - $this->assertEquals($s1->id, $f1->get_scaleid()); + $this->assertEquals($s1->id, $f1->get('scaleid')); // Make the scale of f2 being used. - $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c2->get_id())); + $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c2->get('id'))); // Changing the framework where the scale is not used. - $result = $this->update_competency_framework($f1->get_id(), 3, true); + $result = $this->update_competency_framework($f1->get('id'), 3, true); - $f1 = new \core_competency\competency_framework($f1->get_id()); - $this->assertEquals($this->scale3->id, $f1->get_scaleid()); + $f1 = new \core_competency\competency_framework($f1->get('id')); + $this->assertEquals($this->scale3->id, $f1->get('scaleid')); // Changing the framework where the scale is used. try { - $result = $this->update_competency_framework($f2->get_id(), 4, true); + $result = $this->update_competency_framework($f2->get('id'), 4, true); $this->fail('The scale cannot be changed once used.'); } catch (\core\invalid_persistent_exception $e) { $this->assertRegexp('/scaleid/', $e->getMessage()); @@ -699,9 +699,9 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result); $this->assertCount(2, $result); $f = (object) array_shift($result); - $this->assertEquals($framework1->get_id(), $f->id); + $this->assertEquals($framework1->get('id'), $f->id); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->id); + $this->assertEquals($framework2->get('id'), $f->id); // Search on ID number. $result = external::list_competency_frameworks('shortname', 'ASC', 0, 10, @@ -709,7 +709,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result); $this->assertCount(1, $result); $f = (object) array_shift($result); - $this->assertEquals($framework2->get_id(), $f->id); + $this->assertEquals($framework2->get('id'), $f->id); // Search on shortname. $result = external::list_competency_frameworks('shortname', 'ASC', 0, 10, @@ -717,7 +717,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result); $this->assertCount(1, $result); $f = (object) array_shift($result); - $this->assertEquals($framework1->get_id(), $f->id); + $this->assertEquals($framework1->get('id'), $f->id); // No match. $result = external::list_competency_frameworks('shortname', 'ASC', 0, 10, @@ -768,7 +768,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { public function test_create_competency_with_read_permissions() { $framework = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_framework(); $this->setUser($this->user); - $competency = $this->create_competency(1, $framework->get_id()); + $competency = $this->create_competency(1, $framework->get('id')); } /** @@ -1077,17 +1077,17 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); $f2 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id(), 'shortname' => 'A')); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); - $c5 = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'), 'shortname' => 'A')); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); + $c5 = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); - $result = external::count_competencies(array(array('column' => 'competencyframeworkid', 'value' => $f2->get_id()))); + $result = external::count_competencies(array(array('column' => 'competencyframeworkid', 'value' => $f2->get('id')))); $result = external_api::clean_returnvalue(external::count_competencies_returns(), $result); $this->assertEquals(2, $result); - $result = external::count_competencies(array(array('column' => 'competencyframeworkid', 'value' => $f1->get_id()))); + $result = external::count_competencies(array(array('column' => 'competencyframeworkid', 'value' => $f1->get('id')))); $result = external_api::clean_returnvalue(external::count_competencies_returns(), $result); $this->assertEquals(3, $result); @@ -1503,24 +1503,24 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $user = $dg->create_user(); $plan = $lpg->create_plan(array('userid' => $user->id)); $framework = $lpg->create_framework(); - $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $pc1 = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $comp1->get_id())); - $pc2 = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $comp2->get_id())); - $pc3 = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $comp3->get_id())); + $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $comp3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $pc1 = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $comp1->get('id'))); + $pc2 = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $comp2->get('id'))); + $pc3 = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $comp3->get('id'))); // Complete the plan to generate user_competency_plan entries. api::complete_plan($plan); // Confirm the data we have. - $this->assertEquals(3, plan_competency::count_records(array('planid' => $plan->get_id()))); - $this->assertEquals(3, user_competency_plan::count_records(array('planid' => $plan->get_id(), 'userid' => $user->id))); + $this->assertEquals(3, plan_competency::count_records(array('planid' => $plan->get('id')))); + $this->assertEquals(3, user_competency_plan::count_records(array('planid' => $plan->get('id'), 'userid' => $user->id))); // Delete the plan now. - api::delete_plan($plan->get_id()); - $this->assertEquals(0, plan_competency::count_records(array('planid' => $plan->get_id()))); - $this->assertEquals(0, user_competency_plan::count_records(array('planid' => $plan->get_id(), 'userid' => $user->id))); + api::delete_plan($plan->get('id')); + $this->assertEquals(0, plan_competency::count_records(array('planid' => $plan->get('id')))); + $this->assertEquals(0, user_competency_plan::count_records(array('planid' => $plan->get('id'), 'userid' => $user->id))); } public function test_list_plan_competencies() { @@ -1532,37 +1532,37 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $f1 = $lpg->create_framework(); $f2 = $lpg->create_framework(); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c1c = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); - $c2b = $lpg->create_competency(array('competencyframeworkid' => $f2->get_id())); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c1c = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); + $c2b = $lpg->create_competency(array('competencyframeworkid' => $f2->get('id'))); $tpl = $lpg->create_template(); - $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1a->get_id())); - $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1c->get_id())); - $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c2b->get_id())); + $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1a->get('id'))); + $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1c->get('id'))); + $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c2b->get('id'))); - $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get_id())); + $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get('id'))); - $uc1a = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1a->get_id(), + $uc1a = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1a->get('id'), 'status' => user_competency::STATUS_IN_REVIEW, 'reviewerid' => $this->creator->id)); - $uc1b = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1b->get_id())); - $uc2b = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c2b->get_id(), + $uc1b = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1b->get('id'))); + $uc2b = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c2b->get('id'), 'grade' => 2, 'proficiency' => 1)); - $ux1a = $lpg->create_user_competency(array('userid' => $this->creator->id, 'competencyid' => $c1a->get_id())); + $ux1a = $lpg->create_user_competency(array('userid' => $this->creator->id, 'competencyid' => $c1a->get('id'))); - $result = external::list_plan_competencies($plan->get_id()); + $result = external::list_plan_competencies($plan->get('id')); $result = external::clean_returnvalue(external::list_plan_competencies_returns(), $result); $this->assertCount(3, $result); - $this->assertEquals($c1a->get_id(), $result[0]['competency']['id']); + $this->assertEquals($c1a->get('id'), $result[0]['competency']['id']); $this->assertEquals($this->user->id, $result[0]['usercompetency']['userid']); $this->assertArrayNotHasKey('usercompetencyplan', $result[0]); - $this->assertEquals($c1c->get_id(), $result[1]['competency']['id']); + $this->assertEquals($c1c->get('id'), $result[1]['competency']['id']); $this->assertEquals($this->user->id, $result[1]['usercompetency']['userid']); $this->assertArrayNotHasKey('usercompetencyplan', $result[1]); - $this->assertEquals($c2b->get_id(), $result[2]['competency']['id']); + $this->assertEquals($c2b->get('id'), $result[2]['competency']['id']); $this->assertEquals($this->user->id, $result[2]['usercompetency']['userid']); $this->assertArrayNotHasKey('usercompetencyplan', $result[2]); $this->assertEquals(user_competency::STATUS_IN_REVIEW, $result[0]['usercompetency']['status']); @@ -1571,29 +1571,29 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $this->assertEquals(1, $result[2]['usercompetency']['proficiency']); // Check the return values when the plan status is complete. - $completedplan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get_id(), + $completedplan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get('id'), 'status' => plan::STATUS_COMPLETE)); - $uc1a = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c1a->get_id(), - 'planid' => $completedplan->get_id())); - $uc1b = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c1c->get_id(), - 'planid' => $completedplan->get_id())); - $uc2b = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c2b->get_id(), - 'planid' => $completedplan->get_id(), 'grade' => 2, 'proficiency' => 1)); - $ux1a = $lpg->create_user_competency_plan(array('userid' => $this->creator->id, 'competencyid' => $c1a->get_id(), - 'planid' => $completedplan->get_id())); + $uc1a = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c1a->get('id'), + 'planid' => $completedplan->get('id'))); + $uc1b = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c1c->get('id'), + 'planid' => $completedplan->get('id'))); + $uc2b = $lpg->create_user_competency_plan(array('userid' => $this->user->id, 'competencyid' => $c2b->get('id'), + 'planid' => $completedplan->get('id'), 'grade' => 2, 'proficiency' => 1)); + $ux1a = $lpg->create_user_competency_plan(array('userid' => $this->creator->id, 'competencyid' => $c1a->get('id'), + 'planid' => $completedplan->get('id'))); - $result = external::list_plan_competencies($completedplan->get_id()); + $result = external::list_plan_competencies($completedplan->get('id')); $result = external::clean_returnvalue(external::list_plan_competencies_returns(), $result); $this->assertCount(3, $result); - $this->assertEquals($c1a->get_id(), $result[0]['competency']['id']); + $this->assertEquals($c1a->get('id'), $result[0]['competency']['id']); $this->assertEquals($this->user->id, $result[0]['usercompetencyplan']['userid']); $this->assertArrayNotHasKey('usercompetency', $result[0]); - $this->assertEquals($c1c->get_id(), $result[1]['competency']['id']); + $this->assertEquals($c1c->get('id'), $result[1]['competency']['id']); $this->assertEquals($this->user->id, $result[1]['usercompetencyplan']['userid']); $this->assertArrayNotHasKey('usercompetency', $result[1]); - $this->assertEquals($c2b->get_id(), $result[2]['competency']['id']); + $this->assertEquals($c2b->get('id'), $result[2]['competency']['id']); $this->assertEquals($this->user->id, $result[2]['usercompetencyplan']['userid']); $this->assertArrayNotHasKey('usercompetency', $result[2]); $this->assertEquals(null, $result[1]['usercompetencyplan']['grade']); @@ -1642,16 +1642,16 @@ class core_competency_external_testcase extends externallib_advanced_testcase { // Create a competency. $framework = $lpg->create_framework(); - $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // Add the competency. - external::add_competency_to_template($template->id, $competency->get_id()); + external::add_competency_to_template($template->id, $competency->get('id')); // Check that it was added. $this->assertEquals(1, external::count_competencies_in_template($template->id)); // Check that we can remove the competency. - external::remove_competency_from_template($template->id, $competency->get_id()); + external::remove_competency_from_template($template->id, $competency->get('id')); // Check that it was removed. $this->assertEquals(0, external::count_competencies_in_template($template->id)); @@ -1662,7 +1662,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { // Check we can not remove the competency now. try { - external::add_competency_to_template($template->id, $competency->get_id()); + external::add_competency_to_template($template->id, $competency->get('id')); $this->fail('Exception expected due to not permissions to manage template competencies'); } catch (moodle_exception $e) { $this->assertEquals('nopermissions', $e->errorcode); @@ -1703,7 +1703,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { 'competencyid' => $competency4->id )); - $this->assertEquals(2, $templcomp4->get_sortorder()); + $this->assertEquals(2, $templcomp4->get('sortorder')); // This is a move up. external::reorder_template_competency($template->id, $competency4->id, $competency2->id); @@ -2233,68 +2233,68 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); $framework2 = $lpg->create_framework(); - $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency4 = $lpg->create_competency(array('competencyframeworkid' => $framework2->get_id())); + $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency4 = $lpg->create_competency(array('competencyframeworkid' => $framework2->get('id'))); // The lower one always as competencyid. - $result = external::add_related_competency($competency1->get_id(), $competency2->get_id()); + $result = external::add_related_competency($competency1->get('id'), $competency2->get('id')); $result = external_api::clean_returnvalue(external::add_related_competency_returns(), $result); $this->assertTrue($result); $this->assertTrue($DB->record_exists_select( related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', array( - 'cid' => $competency1->get_id(), - 'rid' => $competency2->get_id() + 'cid' => $competency1->get('id'), + 'rid' => $competency2->get('id') ) )); $this->assertFalse($DB->record_exists_select( related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', array( - 'cid' => $competency2->get_id(), - 'rid' => $competency1->get_id() + 'cid' => $competency2->get('id'), + 'rid' => $competency1->get('id') ) )); - $result = external::add_related_competency($competency3->get_id(), $competency1->get_id()); + $result = external::add_related_competency($competency3->get('id'), $competency1->get('id')); $result = external_api::clean_returnvalue(external::add_related_competency_returns(), $result); $this->assertTrue($result); $this->assertTrue($DB->record_exists_select( related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', array( - 'cid' => $competency1->get_id(), - 'rid' => $competency3->get_id() + 'cid' => $competency1->get('id'), + 'rid' => $competency3->get('id') ) )); $this->assertFalse($DB->record_exists_select( related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', array( - 'cid' => $competency3->get_id(), - 'rid' => $competency1->get_id() + 'cid' => $competency3->get('id'), + 'rid' => $competency1->get('id') ) )); // We can not allow a duplicate relation, not even in the other direction. $this->assertEquals(1, $DB->count_records_select(related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', - array('cid' => $competency1->get_id(), 'rid' => $competency2->get_id()))); + array('cid' => $competency1->get('id'), 'rid' => $competency2->get('id')))); $this->assertEquals(0, $DB->count_records_select(related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', - array('rid' => $competency1->get_id(), 'cid' => $competency2->get_id()))); - $result = external::add_related_competency($competency2->get_id(), $competency1->get_id()); + array('rid' => $competency1->get('id'), 'cid' => $competency2->get('id')))); + $result = external::add_related_competency($competency2->get('id'), $competency1->get('id')); $result = external_api::clean_returnvalue(external::add_related_competency_returns(), $result); $this->assertTrue($result); $this->assertEquals(1, $DB->count_records_select(related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', - array('cid' => $competency1->get_id(), 'rid' => $competency2->get_id()))); + array('cid' => $competency1->get('id'), 'rid' => $competency2->get('id')))); $this->assertEquals(0, $DB->count_records_select(related_competency::TABLE, 'competencyid = :cid AND relatedcompetencyid = :rid', - array('rid' => $competency1->get_id(), 'cid' => $competency2->get_id()))); + array('rid' => $competency1->get('id'), 'cid' => $competency2->get('id')))); // Check that we cannot create links across frameworks. try { - external::add_related_competency($competency1->get_id(), $competency4->get_id()); + external::add_related_competency($competency1->get('id'), $competency4->get('id')); $this->fail('Exception expected due mis-use of shared competencies'); } catch (invalid_persistent_exception $e) { // Yay! @@ -2305,7 +2305,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { // Check we can not add the related competency now. try { - external::add_related_competency($competency1->get_id(), $competency3->get_id()); + external::add_related_competency($competency1->get('id'), $competency3->get('id')); $this->fail('Exception expected due to not permissions to manage template competencies'); } catch (moodle_exception $e) { $this->assertEquals('nopermissions', $e->errorcode); @@ -2323,27 +2323,27 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $rc1 = $lpg->create_related_competency(array('competencyid' => $c1->get_id(), 'relatedcompetencyid' => $c2->get_id())); - $rc2 = $lpg->create_related_competency(array('competencyid' => $c2->get_id(), 'relatedcompetencyid' => $c3->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $rc1 = $lpg->create_related_competency(array('competencyid' => $c1->get('id'), 'relatedcompetencyid' => $c2->get('id'))); + $rc2 = $lpg->create_related_competency(array('competencyid' => $c2->get('id'), 'relatedcompetencyid' => $c3->get('id'))); $this->assertEquals(2, related_competency::count_records()); // Returns false when the relation does not exist. - $result = external::remove_related_competency($c1->get_id(), $c3->get_id()); + $result = external::remove_related_competency($c1->get('id'), $c3->get('id')); $result = external_api::clean_returnvalue(external::remove_related_competency_returns(), $result); $this->assertFalse($result); // Returns true on success. - $result = external::remove_related_competency($c2->get_id(), $c3->get_id()); + $result = external::remove_related_competency($c2->get('id'), $c3->get('id')); $result = external_api::clean_returnvalue(external::remove_related_competency_returns(), $result); $this->assertTrue($result); $this->assertEquals(1, related_competency::count_records()); // We don't need to specify competencyid and relatedcompetencyid in the right order. - $result = external::remove_related_competency($c2->get_id(), $c1->get_id()); + $result = external::remove_related_competency($c2->get('id'), $c1->get('id')); $result = external_api::clean_returnvalue(external::remove_related_competency_returns(), $result); $this->assertTrue($result); $this->assertEquals(0, related_competency::count_records()); @@ -2359,18 +2359,18 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); // We have 1-2, 1-3, 2-4, and no relation between 2-3 nor 1-4 nor 5. - $rc12 = $lpg->create_related_competency(array('competencyid' => $c1->get_id(), 'relatedcompetencyid' => $c2->get_id())); - $rc13 = $lpg->create_related_competency(array('competencyid' => $c1->get_id(), 'relatedcompetencyid' => $c3->get_id())); - $rc24 = $lpg->create_related_competency(array('competencyid' => $c2->get_id(), 'relatedcompetencyid' => $c4->get_id())); + $rc12 = $lpg->create_related_competency(array('competencyid' => $c1->get('id'), 'relatedcompetencyid' => $c2->get('id'))); + $rc13 = $lpg->create_related_competency(array('competencyid' => $c1->get('id'), 'relatedcompetencyid' => $c3->get('id'))); + $rc24 = $lpg->create_related_competency(array('competencyid' => $c2->get('id'), 'relatedcompetencyid' => $c4->get('id'))); - $result = external::search_competencies('comp', $framework->get_id(), true); + $result = external::search_competencies('comp', $framework->get('id'), true); $result = external_api::clean_returnvalue(external::search_competencies_returns(), $result); $this->assertCount(5, $result); @@ -2410,20 +2410,20 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $pl1 = $lpg->create_plan($plan); $framework = $lpg->create_framework(); $competency = $lpg->create_competency( - array('competencyframeworkid' => $framework->get_id()) + array('competencyframeworkid' => $framework->get('id')) ); - $this->assertTrue(external::add_competency_to_plan($pl1->get_id(), $competency->get_id())); + $this->assertTrue(external::add_competency_to_plan($pl1->get('id'), $competency->get('id'))); // A competency cannot be added to plan based on template. $template = $lpg->create_template(); $plan = array ( 'userid' => $usermanage->id, 'status' => \core_competency\plan::STATUS_ACTIVE, - 'templateid' => $template->get_id() + 'templateid' => $template->get('id') ); $pl2 = $lpg->create_plan($plan); try { - external::add_competency_to_plan($pl2->get_id(), $competency->get_id()); + external::add_competency_to_plan($pl2->get('id'), $competency->get('id')); $this->fail('A competency cannot be added to plan based on template'); } catch (coding_exception $ex) { $this->assertTrue(true); @@ -2432,7 +2432,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { // User without capability cannot add competency to a plan. $this->setUser($user); try { - external::add_competency_to_plan($pl1->get_id(), $competency->get_id()); + external::add_competency_to_plan($pl1->get('id'), $competency->get('id')); $this->fail('User without capability cannot add competency to a plan'); } catch (required_capability_exception $ex) { $this->assertTrue(true); @@ -2472,15 +2472,15 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $pl1 = $lpg->create_plan($plan); $framework = $lpg->create_framework(); $competency = $lpg->create_competency( - array('competencyframeworkid' => $framework->get_id()) + array('competencyframeworkid' => $framework->get('id')) ); $lpg->create_plan_competency( array( - 'planid' => $pl1->get_id(), - 'competencyid' => $competency->get_id() + 'planid' => $pl1->get('id'), + 'competencyid' => $competency->get('id') ) ); - $this->assertTrue(external::remove_competency_from_plan($pl1->get_id(), $competency->get_id())); + $this->assertTrue(external::remove_competency_from_plan($pl1->get('id'), $competency->get('id'))); $this->assertCount(0, $pl1->get_competencies()); } @@ -2516,39 +2516,39 @@ class core_competency_external_testcase extends externallib_advanced_testcase { ); $pl1 = $lpg->create_plan($plan); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c5 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); - $lpg->create_plan_competency(array('planid' => $pl1->get_id(), 'competencyid' => $c1->get_id(), 'sortorder' => 1)); - $lpg->create_plan_competency(array('planid' => $pl1->get_id(), 'competencyid' => $c2->get_id(), 'sortorder' => 2)); - $lpg->create_plan_competency(array('planid' => $pl1->get_id(), 'competencyid' => $c3->get_id(), 'sortorder' => 3)); - $lpg->create_plan_competency(array('planid' => $pl1->get_id(), 'competencyid' => $c4->get_id(), 'sortorder' => 4)); - $lpg->create_plan_competency(array('planid' => $pl1->get_id(), 'competencyid' => $c5->get_id(), 'sortorder' => 5)); + $lpg->create_plan_competency(array('planid' => $pl1->get('id'), 'competencyid' => $c1->get('id'), 'sortorder' => 1)); + $lpg->create_plan_competency(array('planid' => $pl1->get('id'), 'competencyid' => $c2->get('id'), 'sortorder' => 2)); + $lpg->create_plan_competency(array('planid' => $pl1->get('id'), 'competencyid' => $c3->get('id'), 'sortorder' => 3)); + $lpg->create_plan_competency(array('planid' => $pl1->get('id'), 'competencyid' => $c4->get('id'), 'sortorder' => 4)); + $lpg->create_plan_competency(array('planid' => $pl1->get('id'), 'competencyid' => $c5->get('id'), 'sortorder' => 5)); // Test if removing competency from plan don't create sortorder holes. - external::remove_competency_from_plan($pl1->get_id(), $c4->get_id()); + external::remove_competency_from_plan($pl1->get('id'), $c4->get('id')); $plancomp5 = plan_competency::get_record(array( - 'planid' => $pl1->get_id(), - 'competencyid' => $c5->get_id() + 'planid' => $pl1->get('id'), + 'competencyid' => $c5->get('id') )); - $this->assertEquals(3, $plancomp5->get_sortorder()); + $this->assertEquals(3, $plancomp5->get('sortorder')); - $this->assertTrue(external::reorder_plan_competency($pl1->get_id(), $c2->get_id(), $c5->get_id())); - $this->assertTrue(external::reorder_plan_competency($pl1->get_id(), $c3->get_id(), $c1->get_id())); - $plancompetencies = plan_competency::get_records(array('planid' => $pl1->get_id()), 'sortorder', 'ASC'); + $this->assertTrue(external::reorder_plan_competency($pl1->get('id'), $c2->get('id'), $c5->get('id'))); + $this->assertTrue(external::reorder_plan_competency($pl1->get('id'), $c3->get('id'), $c1->get('id'))); + $plancompetencies = plan_competency::get_records(array('planid' => $pl1->get('id')), 'sortorder', 'ASC'); $plcmp1 = $plancompetencies[0]; $plcmp2 = $plancompetencies[1]; $plcmp3 = $plancompetencies[2]; $plcmp4 = $plancompetencies[3]; - $this->assertEquals($plcmp1->get_competencyid(), $c3->get_id()); - $this->assertEquals($plcmp2->get_competencyid(), $c1->get_id()); - $this->assertEquals($plcmp3->get_competencyid(), $c5->get_id()); - $this->assertEquals($plcmp4->get_competencyid(), $c2->get_id()); + $this->assertEquals($plcmp1->get('competencyid'), $c3->get('id')); + $this->assertEquals($plcmp2->get('competencyid'), $c1->get('id')); + $this->assertEquals($plcmp3->get('competencyid'), $c5->get('id')); + $this->assertEquals($plcmp4->get('competencyid'), $c2->get('id')); } /** @@ -2559,13 +2559,13 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'sortorder' => 20)); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'sortorder' => 1)); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'sortorder' => 20)); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'sortorder' => 1)); - $this->assertEquals(0, $c1->get_sortorder()); - $this->assertEquals(1, $c2->get_sortorder()); - $this->assertEquals(2, $c3->get_sortorder()); + $this->assertEquals(0, $c1->get('sortorder')); + $this->assertEquals(1, $c2->get('sortorder')); + $this->assertEquals(2, $c3->get('sortorder')); } /** @@ -2578,21 +2578,21 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); - $c2b = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); - $c2c = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); - $c2d = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); + $c2b = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); + $c2c = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); + $c2d = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); - $this->assertEquals(0, $c1->get_sortorder()); - $this->assertEquals(1, $c2->get_sortorder()); - $this->assertEquals(0, $c2a->get_sortorder()); - $this->assertEquals(1, $c2b->get_sortorder()); - $this->assertEquals(2, $c2c->get_sortorder()); - $this->assertEquals(3, $c2d->get_sortorder()); + $this->assertEquals(0, $c1->get('sortorder')); + $this->assertEquals(1, $c2->get('sortorder')); + $this->assertEquals(0, $c2a->get('sortorder')); + $this->assertEquals(1, $c2b->get('sortorder')); + $this->assertEquals(2, $c2c->get('sortorder')); + $this->assertEquals(3, $c2d->get('sortorder')); - $result = external::delete_competency($c1->get_id()); + $result = external::delete_competency($c1->get('id')); $result = external_api::clean_returnvalue(external::delete_competency_returns(), $result); $c2->read(); @@ -2601,13 +2601,13 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $c2c->read(); $c2d->read(); - $this->assertEquals(0, $c2->get_sortorder()); - $this->assertEquals(0, $c2a->get_sortorder()); - $this->assertEquals(1, $c2b->get_sortorder()); - $this->assertEquals(2, $c2c->get_sortorder()); - $this->assertEquals(3, $c2d->get_sortorder()); + $this->assertEquals(0, $c2->get('sortorder')); + $this->assertEquals(0, $c2a->get('sortorder')); + $this->assertEquals(1, $c2b->get('sortorder')); + $this->assertEquals(2, $c2c->get('sortorder')); + $this->assertEquals(3, $c2d->get('sortorder')); - $result = external::delete_competency($c2b->get_id()); + $result = external::delete_competency($c2b->get('id')); $result = external_api::clean_returnvalue(external::delete_competency_returns(), $result); $c2->read(); @@ -2615,10 +2615,10 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $c2c->read(); $c2d->read(); - $this->assertEquals(0, $c2->get_sortorder()); - $this->assertEquals(0, $c2a->get_sortorder()); - $this->assertEquals(1, $c2c->get_sortorder()); - $this->assertEquals(2, $c2d->get_sortorder()); + $this->assertEquals(0, $c2->get('sortorder')); + $this->assertEquals(0, $c2a->get('sortorder')); + $this->assertEquals(1, $c2c->get('sortorder')); + $this->assertEquals(2, $c2d->get('sortorder')); } /** @@ -2631,21 +2631,21 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c1a = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c1b = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2a = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); - $c2b = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id(), 'parentid' => $c2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c1a = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c1b = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2a = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); + $c2b = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'), 'parentid' => $c2->get('id'))); - $this->assertEquals(0, $c1->get_sortorder()); - $this->assertEquals(0, $c1a->get_sortorder()); - $this->assertEquals(1, $c1b->get_sortorder()); - $this->assertEquals(1, $c2->get_sortorder()); - $this->assertEquals(0, $c2a->get_sortorder()); - $this->assertEquals(1, $c2b->get_sortorder()); + $this->assertEquals(0, $c1->get('sortorder')); + $this->assertEquals(0, $c1a->get('sortorder')); + $this->assertEquals(1, $c1b->get('sortorder')); + $this->assertEquals(1, $c2->get('sortorder')); + $this->assertEquals(0, $c2a->get('sortorder')); + $this->assertEquals(1, $c2b->get('sortorder')); - $result = external::set_parent_competency($c2a->get_id(), $c1->get_id()); + $result = external::set_parent_competency($c2a->get('id'), $c1->get('id')); $result = external_api::clean_returnvalue(external::set_parent_competency_returns(), $result); $c1->read(); @@ -2655,15 +2655,15 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $c2a->read(); $c2b->read(); - $this->assertEquals(0, $c1->get_sortorder()); - $this->assertEquals(0, $c1a->get_sortorder()); - $this->assertEquals(1, $c1b->get_sortorder()); - $this->assertEquals(2, $c2a->get_sortorder()); - $this->assertEquals(1, $c2->get_sortorder()); - $this->assertEquals(0, $c2b->get_sortorder()); + $this->assertEquals(0, $c1->get('sortorder')); + $this->assertEquals(0, $c1a->get('sortorder')); + $this->assertEquals(1, $c1b->get('sortorder')); + $this->assertEquals(2, $c2a->get('sortorder')); + $this->assertEquals(1, $c2->get('sortorder')); + $this->assertEquals(0, $c2b->get('sortorder')); // Move a root node. - $result = external::set_parent_competency($c2->get_id(), $c1b->get_id()); + $result = external::set_parent_competency($c2->get('id'), $c1b->get('id')); $result = external_api::clean_returnvalue(external::set_parent_competency_returns(), $result); $c1->read(); @@ -2673,12 +2673,12 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $c2a->read(); $c2b->read(); - $this->assertEquals(0, $c1->get_sortorder()); - $this->assertEquals(0, $c1a->get_sortorder()); - $this->assertEquals(1, $c1b->get_sortorder()); - $this->assertEquals(0, $c2->get_sortorder()); - $this->assertEquals(0, $c2b->get_sortorder()); - $this->assertEquals(2, $c2a->get_sortorder()); + $this->assertEquals(0, $c1->get('sortorder')); + $this->assertEquals(0, $c1a->get('sortorder')); + $this->assertEquals(1, $c1b->get('sortorder')); + $this->assertEquals(0, $c2->get('sortorder')); + $this->assertEquals(0, $c2b->get('sortorder')); + $this->assertEquals(2, $c2a->get('sortorder')); } public function test_grade_competency() { @@ -2689,8 +2689,8 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $lpg = $dg->get_plugin_generator('core_competency'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $evidence = external::grade_competency($this->user->id, $c1->get_id(), 1, 'Evil note'); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $evidence = external::grade_competency($this->user->id, $c1->get('id'), 1, 'Evil note'); $this->assertEquals('The competency rating was manually set.', $evidence->description); $this->assertEquals('A', $evidence->gradename); @@ -2699,7 +2699,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $this->setUser($this->user); $this->expectException('required_capability_exception'); - $evidence = external::grade_competency($this->user->id, $c1->get_id(), 1); + $evidence = external::grade_competency($this->user->id, $c1->get('id'), 1); } public function test_grade_competency_in_course() { @@ -2713,10 +2713,10 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $dg->enrol_user($this->creator->id, $course->id, 'editingteacher'); $dg->enrol_user($this->user->id, $course->id, 'student'); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(['competencyframeworkid' => $f1->get_id()]); - $lpg->create_course_competency(['courseid' => $course->id, 'competencyid' => $c1->get_id()]); + $c1 = $lpg->create_competency(['competencyframeworkid' => $f1->get('id')]); + $lpg->create_course_competency(['courseid' => $course->id, 'competencyid' => $c1->get('id')]); - $evidence = external::grade_competency_in_course($course->id, $this->user->id, $c1->get_id(), 1, 'Evil note'); + $evidence = external::grade_competency_in_course($course->id, $this->user->id, $c1->get('id'), 1, 'Evil note'); $this->assertEquals('The competency rating was manually set in the course \'Course: Evil course\'.', $evidence->description); $this->assertEquals('A', $evidence->gradename); @@ -2725,7 +2725,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $this->setUser($this->user); $this->expectException('required_capability_exception'); - $evidence = external::grade_competency_in_course($course->id, $this->user->id, $c1->get_id(), 1); + $evidence = external::grade_competency_in_course($course->id, $this->user->id, $c1->get('id'), 1); } public function test_grade_competency_in_plan() { @@ -2738,16 +2738,16 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $tpl = $lpg->create_template(); - $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $c1->get_id())); + $lpg->create_template_competency(array('templateid' => $tpl->get('id'), 'competencyid' => $c1->get('id'))); - $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get_id(), 'name' => 'Evil')); + $plan = $lpg->create_plan(array('userid' => $this->user->id, 'templateid' => $tpl->get('id'), 'name' => 'Evil')); - $uc = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1->get_id())); + $uc = $lpg->create_user_competency(array('userid' => $this->user->id, 'competencyid' => $c1->get('id'))); - $evidence = external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 1, 'Evil note'); + $evidence = external::grade_competency_in_plan($plan->get('id'), $c1->get('id'), 1, 'Evil note'); $this->assertEquals('The competency rating was manually set in the learning plan \'Evil\'.', $evidence->description); $this->assertEquals('A', $evidence->gradename); @@ -2756,7 +2756,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $this->setUser($this->user); $this->expectException('required_capability_exception'); - $evidence = external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 1); + $evidence = external::grade_competency_in_plan($plan->get('id'), $c1->get('id'), 1); } /** @@ -2790,13 +2790,13 @@ class core_competency_external_testcase extends externallib_advanced_testcase { $settings = course_competency_settings::get_by_courseid($course->id); - $this->assertTrue((bool)$settings->get_pushratingstouserplans()); + $this->assertTrue((bool)$settings->get('pushratingstouserplans')); $result = external::update_course_competency_settings($course->id, array('pushratingstouserplans' => false)); $settings = course_competency_settings::get_by_courseid($course->id); - $this->assertFalse((bool)$settings->get_pushratingstouserplans()); + $this->assertFalse((bool)$settings->get('pushratingstouserplans')); $this->setUser($compnoob); $this->expectException('required_capability_exception'); diff --git a/competency/tests/generator/lib.php b/competency/tests/generator/lib.php index 108ce41260f..2fb49d60620 100644 --- a/competency/tests/generator/lib.php +++ b/competency/tests/generator/lib.php @@ -199,7 +199,7 @@ class core_competency_generator extends component_generator_base { } $relation = related_competency::get_relation($record->competencyid, $record->relatedcompetencyid); - if ($relation->get_id()) { + if ($relation->get('id')) { throw new coding_exception('Relation already exists'); } $relation->create(); diff --git a/competency/tests/generator_test.php b/competency/tests/generator_test.php index 6f20314ec31..633bc9481be 100644 --- a/competency/tests/generator_test.php +++ b/competency/tests/generator_test.php @@ -66,8 +66,8 @@ class core_competency_generator_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); $this->assertEquals(0, competency::count_records()); - $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(2, competency::count_records()); $this->assertInstanceOf('\core_competency\competency', $competency); } @@ -77,12 +77,12 @@ class core_competency_generator_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(0, related_competency::count_records()); - $rc = $lpg->create_related_competency(array('competencyid' => $c1->get_id(), 'relatedcompetencyid' => $c2->get_id())); - $rc = $lpg->create_related_competency(array('competencyid' => $c2->get_id(), 'relatedcompetencyid' => $c3->get_id())); + $rc = $lpg->create_related_competency(array('competencyid' => $c1->get('id'), 'relatedcompetencyid' => $c2->get('id'))); + $rc = $lpg->create_related_competency(array('competencyid' => $c2->get('id'), 'relatedcompetencyid' => $c3->get('id'))); $this->assertEquals(2, related_competency::count_records()); $this->assertInstanceOf('\core_competency\related_competency', $rc); } @@ -104,12 +104,12 @@ class core_competency_generator_testcase extends advanced_testcase { $user = $this->getDataGenerator()->create_user(); $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(0, user_competency::count_records()); - $rc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $rc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get_id())); + $rc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $rc = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get('id'))); $this->assertEquals(2, user_competency::count_records()); $this->assertInstanceOf('\core_competency\user_competency', $rc); } @@ -120,19 +120,19 @@ class core_competency_generator_testcase extends advanced_testcase { $user = $this->getDataGenerator()->create_user(); $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $plan = $lpg->create_plan(array('userid' => $user->id)); $this->assertEquals(0, user_competency_plan::count_records()); $ucp = $lpg->create_user_competency_plan(array( 'userid' => $user->id, - 'competencyid' => $c1->get_id(), - 'planid' => $plan->get_id() + 'competencyid' => $c1->get('id'), + 'planid' => $plan->get('id') )); $ucp = $lpg->create_user_competency_plan(array( 'userid' => $user->id, - 'competencyid' => $c2->get_id(), - 'planid' => $plan->get_id() + 'competencyid' => $c2->get('id'), + 'planid' => $plan->get('id') )); $this->assertEquals(2, user_competency_plan::count_records()); $this->assertInstanceOf('\core_competency\user_competency_plan', $ucp); @@ -155,11 +155,11 @@ class core_competency_generator_testcase extends advanced_testcase { $this->assertEquals(0, template_competency::count_records()); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $template = $lpg->create_template(); - $relation = $lpg->create_template_competency(array('competencyid' => $c1->get_id(), 'templateid' => $template->get_id())); - $relation = $lpg->create_template_competency(array('competencyid' => $c2->get_id(), 'templateid' => $template->get_id())); + $relation = $lpg->create_template_competency(array('competencyid' => $c1->get('id'), 'templateid' => $template->get('id'))); + $relation = $lpg->create_template_competency(array('competencyid' => $c2->get('id'), 'templateid' => $template->get('id'))); $this->assertEquals(2, template_competency::count_records()); $this->assertInstanceOf('\core_competency\template_competency', $relation); } @@ -170,18 +170,18 @@ class core_competency_generator_testcase extends advanced_testcase { $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $plan = $lpg->create_plan(array('userid' => $user->id)); - $pc1 = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c1->get_id())); - $pc2 = $lpg->create_plan_competency(array('planid' => $plan->get_id(), 'competencyid' => $c2->get_id())); + $pc1 = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c1->get('id'))); + $pc2 = $lpg->create_plan_competency(array('planid' => $plan->get('id'), 'competencyid' => $c2->get('id'))); $this->assertEquals(2, plan_competency::count_records()); $this->assertInstanceOf('\core_competency\plan_competency', $pc1); $this->assertInstanceOf('\core_competency\plan_competency', $pc2); - $this->assertEquals($plan->get_id(), $pc1->get_planid()); + $this->assertEquals($plan->get('id'), $pc1->get('planid')); } public function test_create_template_cohort() { @@ -192,9 +192,9 @@ class core_competency_generator_testcase extends advanced_testcase { $c2 = $this->getDataGenerator()->create_cohort(); $t1 = $lpg->create_template(); $this->assertEquals(0, template_cohort::count_records()); - $tc = $lpg->create_template_cohort(array('templateid' => $t1->get_id(), 'cohortid' => $c1->id)); + $tc = $lpg->create_template_cohort(array('templateid' => $t1->get('id'), 'cohortid' => $c1->id)); $this->assertEquals(1, template_cohort::count_records()); - $tc = $lpg->create_template_cohort(array('templateid' => $t1->get_id(), 'cohortid' => $c2->id)); + $tc = $lpg->create_template_cohort(array('templateid' => $t1->get('id'), 'cohortid' => $c2->id)); $this->assertEquals(2, template_cohort::count_records()); $this->assertInstanceOf('\core_competency\template_cohort', $tc); } @@ -205,12 +205,12 @@ class core_competency_generator_testcase extends advanced_testcase { $user = $this->getDataGenerator()->create_user(); $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency'); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $rc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get_id())); - $rc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get_id())); - $e = $lpg->create_evidence(array('usercompetencyid' => $rc1->get_id())); - $e = $lpg->create_evidence(array('usercompetencyid' => $rc2->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $rc1 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c1->get('id'))); + $rc2 = $lpg->create_user_competency(array('userid' => $user->id, 'competencyid' => $c2->get('id'))); + $e = $lpg->create_evidence(array('usercompetencyid' => $rc1->get('id'))); + $e = $lpg->create_evidence(array('usercompetencyid' => $rc2->get('id'))); $this->assertEquals(2, evidence::count_records()); $this->assertInstanceOf('\core_competency\evidence', $e); } @@ -222,15 +222,15 @@ class core_competency_generator_testcase extends advanced_testcase { $course1 = $this->getDataGenerator()->create_course(); $course2 = $this->getDataGenerator()->create_course(); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(0, course_competency::count_records()); - $rc = $lpg->create_course_competency(array('competencyid' => $c1->get_id(), 'courseid' => $course1->id)); - $rc = $lpg->create_course_competency(array('competencyid' => $c2->get_id(), 'courseid' => $course1->id)); + $rc = $lpg->create_course_competency(array('competencyid' => $c1->get('id'), 'courseid' => $course1->id)); + $rc = $lpg->create_course_competency(array('competencyid' => $c2->get('id'), 'courseid' => $course1->id)); $this->assertEquals(2, course_competency::count_records(array('courseid' => $course1->id))); $this->assertEquals(0, course_competency::count_records(array('courseid' => $course2->id))); - $rc = $lpg->create_course_competency(array('competencyid' => $c3->get_id(), 'courseid' => $course2->id)); + $rc = $lpg->create_course_competency(array('competencyid' => $c3->get('id'), 'courseid' => $course2->id)); $this->assertEquals(1, course_competency::count_records(array('courseid' => $course2->id))); $this->assertInstanceOf('\core_competency\course_competency', $rc); } @@ -243,15 +243,15 @@ class core_competency_generator_testcase extends advanced_testcase { $cm1 = $this->getDataGenerator()->create_module('forum', array('course' => $course1->id)); $cm2 = $this->getDataGenerator()->create_module('forum', array('course' => $course1->id)); $framework = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id'))); $this->assertEquals(0, course_module_competency::count_records()); - $rc = $lpg->create_course_module_competency(array('competencyid' => $c1->get_id(), 'cmid' => $cm1->cmid)); - $rc = $lpg->create_course_module_competency(array('competencyid' => $c2->get_id(), 'cmid' => $cm1->cmid)); + $rc = $lpg->create_course_module_competency(array('competencyid' => $c1->get('id'), 'cmid' => $cm1->cmid)); + $rc = $lpg->create_course_module_competency(array('competencyid' => $c2->get('id'), 'cmid' => $cm1->cmid)); $this->assertEquals(2, course_module_competency::count_records(array('cmid' => $cm1->cmid))); $this->assertEquals(0, course_module_competency::count_records(array('cmid' => $cm2->cmid))); - $rc = $lpg->create_course_module_competency(array('competencyid' => $c3->get_id(), 'cmid' => $cm2->cmid)); + $rc = $lpg->create_course_module_competency(array('competencyid' => $c3->get('id'), 'cmid' => $cm2->cmid)); $this->assertEquals(1, course_module_competency::count_records(array('cmid' => $cm2->cmid))); $this->assertInstanceOf('\core_competency\course_module_competency', $rc); } diff --git a/competency/tests/hooks_test.php b/competency/tests/hooks_test.php index c6657c7aa8b..e8be7c41a9a 100644 --- a/competency/tests/hooks_test.php +++ b/competency/tests/hooks_test.php @@ -45,31 +45,31 @@ class core_competency_hooks_testcase extends advanced_testcase { $u1 = $dg->create_user(); $framework = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); - $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); + $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); $c1 = $dg->create_course(); - $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id]); - $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id]); + $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id]); + $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id]); $assign1a = $dg->create_module('assign', ['course' => $c1]); $assign1b = $dg->create_module('assign', ['course' => $c1]); - $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1a->cmid]); - $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1b->cmid]); - $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id, + $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1a->cmid]); + $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1b->cmid]); + $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); - $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id, + $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); $c2 = $dg->create_course(); - $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id]); - $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id]); + $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id]); + $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id]); $assign2a = $dg->create_module('assign', ['course' => $c2]); $assign2b = $dg->create_module('assign', ['course' => $c2]); - $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2a->cmid]); - $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2b->cmid]); - $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id, + $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2a->cmid]); + $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2b->cmid]); + $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); - $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id, + $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); delete_course($c1, false); @@ -92,31 +92,31 @@ class core_competency_hooks_testcase extends advanced_testcase { $u1 = $dg->create_user(); $framework = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); - $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); + $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); $c1 = $dg->create_course(); - $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id]); - $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id]); + $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id]); + $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id]); $assign1a = $dg->create_module('assign', ['course' => $c1]); $assign1b = $dg->create_module('assign', ['course' => $c1]); - $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1a->cmid]); - $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1b->cmid]); - $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id, + $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1a->cmid]); + $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1b->cmid]); + $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); - $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id, + $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); $c2 = $dg->create_course(); - $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id]); - $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id]); + $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id]); + $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id]); $assign2a = $dg->create_module('assign', ['course' => $c2]); $assign2b = $dg->create_module('assign', ['course' => $c2]); - $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2a->cmid]); - $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2b->cmid]); - $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id, + $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2a->cmid]); + $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2b->cmid]); + $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); - $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id, + $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); course_delete_module($assign1b->cmid); @@ -140,31 +140,31 @@ class core_competency_hooks_testcase extends advanced_testcase { $u1 = $dg->create_user(); $framework = $ccg->create_framework(); - $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); - $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); + $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]); $c1 = $dg->create_course(); - $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id]); - $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id]); + $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id]); + $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id]); $assign1a = $dg->create_module('assign', ['course' => $c1]); $assign1b = $dg->create_module('assign', ['course' => $c1]); - $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1a->cmid]); - $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign1b->cmid]); - $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c1->id, + $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1a->cmid]); + $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1b->cmid]); + $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); - $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c1->id, + $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id, 'userid' => $u1->id]); $c2 = $dg->create_course(); - $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id]); - $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id]); + $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id]); + $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id]); $assign2a = $dg->create_module('assign', ['course' => $c2]); $assign2b = $dg->create_module('assign', ['course' => $c2]); - $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2a->cmid]); - $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get_id(), 'cmid' => $assign2b->cmid]); - $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get_id(), 'courseid' => $c2->id, + $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2a->cmid]); + $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2b->cmid]); + $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); - $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get_id(), 'courseid' => $c2->id, + $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id, 'userid' => $u1->id]); reset_course_userdata((object) ['id' => $c1->id, 'reset_competency_ratings' => true]); @@ -192,19 +192,19 @@ class core_competency_hooks_testcase extends advanced_testcase { $t2 = $corecompgen->create_template(); // Create the template cohorts. - core_competency\api::create_template_cohort($t1->get_id(), $c1->id); - core_competency\api::create_template_cohort($t1->get_id(), $c2->id); - core_competency\api::create_template_cohort($t2->get_id(), $c1->id); + core_competency\api::create_template_cohort($t1->get('id'), $c1->id); + core_competency\api::create_template_cohort($t1->get('id'), $c2->id); + core_competency\api::create_template_cohort($t2->get('id'), $c1->id); // Check that the association was made. - $this->assertEquals(2, \core_competency\template_cohort::count_records(array('templateid' => $t1->get_id()))); - $this->assertEquals(1, \core_competency\template_cohort::count_records(array('templateid' => $t2->get_id()))); + $this->assertEquals(2, \core_competency\template_cohort::count_records(array('templateid' => $t1->get('id')))); + $this->assertEquals(1, \core_competency\template_cohort::count_records(array('templateid' => $t2->get('id')))); // Delete the first cohort. cohort_delete_cohort($c1); // Check that the association was removed. - $this->assertEquals(1, \core_competency\template_cohort::count_records(array('templateid' => $t1->get_id()))); - $this->assertEquals(0, \core_competency\template_cohort::count_records(array('templateid' => $t2->get_id()))); + $this->assertEquals(1, \core_competency\template_cohort::count_records(array('templateid' => $t1->get('id')))); + $this->assertEquals(0, \core_competency\template_cohort::count_records(array('templateid' => $t2->get('id')))); } } diff --git a/competency/tests/lib_test.php b/competency/tests/lib_test.php index 4163b286bb2..9ed2e926844 100644 --- a/competency/tests/lib_test.php +++ b/competency/tests/lib_test.php @@ -57,24 +57,24 @@ class core_competency_lib_testcase extends advanced_testcase { accesslib_clear_all_caches_for_unit_testing(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); // In 1 plan. - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); // In 2 plans. - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); // Orphan. + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // In 1 plan. + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // In 2 plans. + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); // Orphan. $p1 = $lpg->create_plan(array('userid' => $u1->id)); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c2->get_id())); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c2->get('id'))); $p2 = $lpg->create_plan(array('userid' => $u1->id)); - $lpg->create_plan_competency(array('planid' => $p2->get_id(), 'competencyid' => $c2->get_id())); + $lpg->create_plan_competency(array('planid' => $p2->get('id'), 'competencyid' => $c2->get('id'))); - $DB->set_field(plan::TABLE, 'timemodified', 1, array('id' => $p1->get_id())); // Make plan 1 appear as old. + $DB->set_field(plan::TABLE, 'timemodified', 1, array('id' => $p1->get('id'))); // Make plan 1 appear as old. $p1->read(); - $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c1->get_id(), + $uc1 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c1->get('id'), 'status' => user_competency::STATUS_IN_REVIEW, 'reviewerid' => $u2->id)); - $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c2->get_id(), + $uc2 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c2->get('id'), 'status' => user_competency::STATUS_IN_REVIEW, 'reviewerid' => $u2->id)); - $uc3 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get_id(), + $uc3 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get('id'), 'status' => user_competency::STATUS_IN_REVIEW, 'reviewerid' => $u2->id)); // Post a comment for the user competency being in one plan. The reviewer is messaged. @@ -87,8 +87,8 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertCount(1, $messages); $message = array_pop($messages); - $expectedurlname = $c1->get_shortname(); - $expectedurl = url::user_competency_in_plan($u1->id, $c1->get_id(), $p1->get_id()); + $expectedurlname = $c1->get('shortname'); + $expectedurl = url::user_competency_in_plan($u1->id, $c1->get('id'), $p1->get('id')); $this->assertEquals(core_user::get_noreply_user()->id, $message->useridfrom); $this->assertEquals($u2->id, $message->useridto); $this->assertTrue(strpos($message->fullmessage, 'Hello world!') !== false); @@ -107,8 +107,8 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertCount(1, $messages); $message = array_pop($messages); - $expectedurlname = $c2->get_shortname(); - $expectedurl = url::user_competency_in_plan($u1->id, $c2->get_id(), $p2->get_id()); + $expectedurlname = $c2->get('shortname'); + $expectedurl = url::user_competency_in_plan($u1->id, $c2->get('id'), $p2->get('id')); $this->assertEquals(core_user::get_noreply_user()->id, $message->useridfrom); $this->assertEquals($u1->id, $message->useridto); $this->assertTrue(strpos($message->fullmessage, 'Hello world!') !== false); @@ -220,7 +220,7 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertEquals($u1->id, $message->useridto); // Post a comment in a plan with reviewer. The reviewer is messaged. - $p1->set_reviewerid($u2->id); + $p1->set('reviewerid', $u2->id); $p1->update(); $this->setUser($u1); $comment = $p1->get_comment_object(); @@ -234,7 +234,7 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertEquals($u2->id, $message->useridto); // Post a comment as reviewer in a plan being reviewed. The owner is messaged. - $p1->set_reviewerid($u2->id); + $p1->set('reviewerid', $u2->id); $p1->update(); $this->setUser($u2); $comment = $p1->get_comment_object(); @@ -248,7 +248,7 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertEquals($u1->id, $message->useridto); // Post a comment as someone else in a plan being reviewed. The owner and reviewer are messaged. - $p1->set_reviewerid($u2->id); + $p1->set('reviewerid', $u2->id); $p1->update(); $this->setUser($u3); $comment = $p1->get_comment_object(); @@ -264,7 +264,7 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertEquals(core_user::get_noreply_user()->id, $message2->useridfrom); $this->assertEquals($u2->id, $message2->useridto); - $p1->set_reviewerid(null); + $p1->set('reviewerid', null); $p1->update(); // Test message content. @@ -277,8 +277,8 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertCount(1, $messages); $message = array_pop($messages); - $expectedurlname = $p1->get_name(); - $expectedurl = url::plan($p1->get_id()); + $expectedurlname = $p1->get('name'); + $expectedurl = url::plan($p1->get('id')); $this->assertTrue(strpos($message->fullmessage, 'Hello world!') !== false); $this->assertTrue(strpos($message->fullmessagehtml, 'Hello world!') !== false); $this->assertEquals(FORMAT_MOODLE, $message->fullmessageformat); @@ -295,8 +295,8 @@ class core_competency_lib_testcase extends advanced_testcase { $this->assertCount(1, $messages); $message = array_pop($messages); - $expectedurlname = $p1->get_name(); - $expectedurl = url::plan($p1->get_id()); + $expectedurlname = $p1->get('name'); + $expectedurl = url::plan($p1->get('id')); $this->assertTrue(strpos($message->fullmessage, 'Hello world!') !== false); $this->assertTrue(strpos($message->fullmessagehtml, 'Hello world!') !== false); $this->assertEquals(FORMAT_HTML, $message->fullmessageformat); diff --git a/competency/tests/performance_helper_test.php b/competency/tests/performance_helper_test.php index 3c95a3124ff..52bee4cf8aa 100644 --- a/competency/tests/performance_helper_test.php +++ b/competency/tests/performance_helper_test.php @@ -45,8 +45,8 @@ class core_competency_performance_helper_testcase extends advanced_testcase { $cat1 = $dg->create_category(); $framework = $lpg->create_framework(); - $competency = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]); - $competency2 = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]); + $competency = $lpg->create_competency(['competencyframeworkid' => $framework->get('id')]); + $competency2 = $lpg->create_competency(['competencyframeworkid' => $framework->get('id')]); $context = $competency->get_context(); $helper = new performance_helper(); @@ -80,10 +80,10 @@ class core_competency_performance_helper_testcase extends advanced_testcase { $cat1 = $dg->create_category(); $framework1 = $lpg->create_framework(); - $comp1a = $lpg->create_competency(['competencyframeworkid' => $framework1->get_id()]); - $comp1b = $lpg->create_competency(['competencyframeworkid' => $framework1->get_id()]); + $comp1a = $lpg->create_competency(['competencyframeworkid' => $framework1->get('id')]); + $comp1b = $lpg->create_competency(['competencyframeworkid' => $framework1->get('id')]); $framework2 = $lpg->create_framework(); - $comp2a = $lpg->create_competency(['competencyframeworkid' => $framework2->get_id()]); + $comp2a = $lpg->create_competency(['competencyframeworkid' => $framework2->get('id')]); $helper = new performance_helper(); $initdbqueries = $DB->perf_get_queries(); @@ -131,9 +131,9 @@ class core_competency_performance_helper_testcase extends advanced_testcase { $cat1 = $dg->create_category(); $framework1 = $lpg->create_framework(['scaleid' => $scale1->id]); - $comp1 = $lpg->create_competency(['competencyframeworkid' => $framework1->get_id()]); - $comp2 = $lpg->create_competency(['competencyframeworkid' => $framework1->get_id(), 'scaleid' => $scale2->id]); - $comp3 = $lpg->create_competency(['competencyframeworkid' => $framework1->get_id()]); + $comp1 = $lpg->create_competency(['competencyframeworkid' => $framework1->get('id')]); + $comp2 = $lpg->create_competency(['competencyframeworkid' => $framework1->get('id'), 'scaleid' => $scale2->id]); + $comp3 = $lpg->create_competency(['competencyframeworkid' => $framework1->get('id')]); $helper = new performance_helper(); $initdbqueries = $DB->perf_get_queries(); diff --git a/competency/tests/plan_test.php b/competency/tests/plan_test.php index 6e9972fc122..c942d9ff1a9 100644 --- a/competency/tests/plan_test.php +++ b/competency/tests/plan_test.php @@ -271,7 +271,7 @@ class core_competency_plan_testcase extends advanced_testcase { $this->assertInstanceOf('core_competency\plan', $plan); // Passing from draft to active. - $plan->set_status(plan::STATUS_ACTIVE); + $plan->set('status', plan::STATUS_ACTIVE); // Draft to active with duedate in the past. $expected = array( @@ -280,25 +280,25 @@ class core_competency_plan_testcase extends advanced_testcase { $this->assertEquals($expected, $plan->validate()); // Draft to active: past date => past date(fail). - $plan->set_duedate(time() - 100); + $plan->set('duedate', time() - 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedateinthepast', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Draft to active: past date => too soon (fail). - $plan->set_duedate(time() + 100); + $plan->set('duedate', time() + 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedatetoosoon', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Draft to active: past date => future date (pass). - $plan->set_duedate(time() + plan::DUEDATE_THRESHOLD + 10); + $plan->set('duedate', time() + plan::DUEDATE_THRESHOLD + 10); $this->assertEquals(true, $plan->validate()); // Draft to active: past date => unset date (pass). - $plan->set_duedate(0); + $plan->set('duedate', 0); $this->assertEquals(true, $plan->validate()); // Updating active plan. @@ -309,63 +309,63 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = 1; $DB->update_record(plan::TABLE, $record); $plan->read(); - $plan->set_description(uniqid()); // Force revalidation. + $plan->set('description', uniqid()); // Force revalidation. $this->assertTrue($plan->is_valid()); // Active to active: past => unset (pass). - $plan->set_duedate(0); + $plan->set('duedate', 0); $this->assertTrue($plan->is_valid()); $plan->update(); // Active to active: unset => unset (pass). - $plan->set_description(uniqid()); // Force revalidation. + $plan->set('description', uniqid()); // Force revalidation. $this->assertTrue($plan->is_valid()); // Active to active: unset date => past date(fail). - $plan->set_duedate(time() - 100); + $plan->set('duedate', time() - 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedateinthepast', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Active to active: unset date => too soon (fail). - $plan->set_duedate(time() + 100); + $plan->set('duedate', time() + 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedatetoosoon', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Active to active: unset date => future date (pass). - $plan->set_duedate(time() + plan::DUEDATE_THRESHOLD + 10); + $plan->set('duedate', time() + plan::DUEDATE_THRESHOLD + 10); $this->assertEquals(true, $plan->validate()); // Updating active plan with future date. $plan->update(); // Active to active: future => same future (pass). - $plan->set_description(uniqid()); // Force revalidation. + $plan->set('description', uniqid()); // Force revalidation. $this->assertTrue($plan->is_valid()); // Active to active: future date => unset date (pass). - $plan->set_duedate(0); + $plan->set('duedate', 0); $this->assertEquals(true, $plan->validate()); // Active to active: future date => past date(fail). - $plan->set_duedate(time() - 100); + $plan->set('duedate', time() - 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedateinthepast', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Active to active: future date => too soon (fail). - $plan->set_duedate(time() + 100); + $plan->set('duedate', time() + 100); $expected = array( 'duedate' => new lang_string('errorcannotsetduedatetoosoon', 'core_competency'), ); $this->assertEquals($expected, $plan->validate()); // Active to active: future date => future date (pass). - $plan->set_duedate(time() + plan::DUEDATE_THRESHOLD + 10); + $plan->set('duedate', time() + plan::DUEDATE_THRESHOLD + 10); $this->assertEquals(true, $plan->validate()); // Completing plan: with due date in the past. @@ -374,7 +374,7 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = time() - 200; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::complete_plan($plan->get_id()); + $success = core_competency\api::complete_plan($plan->get('id')); $this->assertTrue($success); // Completing plan: with due date too soon (pass). @@ -383,7 +383,7 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = time() + 200; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::complete_plan($plan->get_id()); + $success = core_competency\api::complete_plan($plan->get('id')); $this->assertTrue($success); // Completing plan: with due date in the future (pass). @@ -392,7 +392,7 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = time() + plan::DUEDATE_THRESHOLD + 10; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::complete_plan($plan->get_id()); + $success = core_competency\api::complete_plan($plan->get('id')); $this->assertTrue($success); // Completing plan: with due date unset (pass). @@ -401,7 +401,7 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = 0; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::complete_plan($plan->get_id()); + $success = core_competency\api::complete_plan($plan->get('id')); $this->assertTrue($success); // Reopening plan: with due date in the past => duedate unset. @@ -410,10 +410,10 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = time() - 200; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::reopen_plan($plan->get_id()); + $success = core_competency\api::reopen_plan($plan->get('id')); $this->assertTrue($success); $plan->read(); - $this->assertEquals(0, $plan->get_duedate()); + $this->assertEquals(0, $plan->get('duedate')); // Reopening plan: with due date too soon => duedate unset. $record = $plan->to_record(); @@ -421,10 +421,10 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = time() + 100; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::reopen_plan($plan->get_id()); + $success = core_competency\api::reopen_plan($plan->get('id')); $this->assertTrue($success); $plan->read(); - $this->assertEquals(0, $plan->get_duedate()); + $this->assertEquals(0, $plan->get('duedate')); // Reopening plan: with due date in the future => duedate unchanged. $record = $plan->to_record(); @@ -433,13 +433,13 @@ class core_competency_plan_testcase extends advanced_testcase { $record->duedate = $duedate; $DB->update_record(plan::TABLE, $record); - $success = core_competency\api::reopen_plan($plan->get_id()); + $success = core_competency\api::reopen_plan($plan->get('id')); $this->assertTrue($success); $plan->read(); // Check that the due date has not changed. - $this->assertNotEquals(0, $plan->get_duedate()); - $this->assertEquals($duedate, $plan->get_duedate()); + $this->assertNotEquals(0, $plan->get('duedate')); + $this->assertEquals($duedate, $plan->get('duedate')); } public function test_get_by_user_and_competency() { @@ -455,74 +455,74 @@ class core_competency_plan_testcase extends advanced_testcase { $u4 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $tpl1 = $lpg->create_template(); - $lpg->create_template_competency(array('competencyid' => $c1->get_id(), 'templateid' => $tpl1->get_id())); + $lpg->create_template_competency(array('competencyid' => $c1->get('id'), 'templateid' => $tpl1->get('id'))); $p1 = $lpg->create_plan(array('userid' => $u1->id)); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c1->get_id())); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c1->get('id'))); $p2 = $lpg->create_plan(array('userid' => $u2->id)); - $lpg->create_plan_competency(array('planid' => $p2->get_id(), 'competencyid' => $c1->get_id())); - $p3 = $lpg->create_plan(array('userid' => $u3->id, 'templateid' => $tpl1->get_id())); - $p4 = $lpg->create_plan(array('userid' => $u4->id, 'templateid' => $tpl1->get_id())); + $lpg->create_plan_competency(array('planid' => $p2->get('id'), 'competencyid' => $c1->get('id'))); + $p3 = $lpg->create_plan(array('userid' => $u3->id, 'templateid' => $tpl1->get('id'))); + $p4 = $lpg->create_plan(array('userid' => $u4->id, 'templateid' => $tpl1->get('id'))); api::complete_plan($p2); api::complete_plan($p4); // Finding a plan, not completed. - $plans = plan::get_by_user_and_competency($u1->id, $c1->get_id()); + $plans = plan::get_by_user_and_competency($u1->id, $c1->get('id')); $this->assertCount(1, $plans); $plan = array_shift($plans); - $this->assertEquals($p1->get_id(), $plan->get_id()); - $this->assertNotEquals(plan::STATUS_COMPLETE, $plan->get_status()); + $this->assertEquals($p1->get('id'), $plan->get('id')); + $this->assertNotEquals(plan::STATUS_COMPLETE, $plan->get('status')); // Finding a completed plan. - $plans = plan::get_by_user_and_competency($u2->id, $c1->get_id()); + $plans = plan::get_by_user_and_competency($u2->id, $c1->get('id')); $this->assertCount(1, $plans); $plan = array_shift($plans); - $this->assertEquals($p2->get_id(), $plan->get_id()); - $this->assertEquals(plan::STATUS_COMPLETE, $plan->get_status()); + $this->assertEquals($p2->get('id'), $plan->get('id')); + $this->assertEquals(plan::STATUS_COMPLETE, $plan->get('status')); // Finding a plan based on a template, not completed. - $plans = plan::get_by_user_and_competency($u3->id, $c1->get_id()); + $plans = plan::get_by_user_and_competency($u3->id, $c1->get('id')); $this->assertCount(1, $plans); $plan = array_shift($plans); - $this->assertEquals($p3->get_id(), $plan->get_id()); + $this->assertEquals($p3->get('id'), $plan->get('id')); $this->assertTrue($plan->is_based_on_template()); - $this->assertNotEquals(plan::STATUS_COMPLETE, $plan->get_status()); + $this->assertNotEquals(plan::STATUS_COMPLETE, $plan->get('status')); // Finding a plan based on a template. - $plans = plan::get_by_user_and_competency($u4->id, $c1->get_id()); + $plans = plan::get_by_user_and_competency($u4->id, $c1->get('id')); $this->assertCount(1, $plans); $plan = array_shift($plans); - $this->assertEquals($p4->get_id(), $plan->get_id()); + $this->assertEquals($p4->get('id'), $plan->get('id')); $this->assertTrue($plan->is_based_on_template()); - $this->assertEquals(plan::STATUS_COMPLETE, $plan->get_status()); + $this->assertEquals(plan::STATUS_COMPLETE, $plan->get('status')); // Finding more than one plan, no template. $p5 = $lpg->create_plan(array('userid' => $u1->id)); - $lpg->create_plan_competency(array('planid' => $p5->get_id(), 'competencyid' => $c1->get_id())); - $plans = plan::get_by_user_and_competency($u1->id, $c1->get_id()); + $lpg->create_plan_competency(array('planid' => $p5->get('id'), 'competencyid' => $c1->get('id'))); + $plans = plan::get_by_user_and_competency($u1->id, $c1->get('id')); $this->assertCount(2, $plans); $plan = array_shift($plans); - $this->assertEquals($p1->get_id(), $plan->get_id()); + $this->assertEquals($p1->get('id'), $plan->get('id')); $plan = array_shift($plans); - $this->assertEquals($p5->get_id(), $plan->get_id()); + $this->assertEquals($p5->get('id'), $plan->get('id')); // Finding more than one plan, with template. - $p6 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get_id())); - $plans = plan::get_by_user_and_competency($u1->id, $c1->get_id()); + $p6 = $lpg->create_plan(array('userid' => $u1->id, 'templateid' => $tpl1->get('id'))); + $plans = plan::get_by_user_and_competency($u1->id, $c1->get('id')); $this->assertCount(3, $plans); $plan = array_shift($plans); - $this->assertEquals($p1->get_id(), $plan->get_id()); + $this->assertEquals($p1->get('id'), $plan->get('id')); $plan = array_shift($plans); - $this->assertEquals($p5->get_id(), $plan->get_id()); + $this->assertEquals($p5->get('id'), $plan->get('id')); $plan = array_shift($plans); - $this->assertEquals($p6->get_id(), $plan->get_id()); + $this->assertEquals($p6->get('id'), $plan->get('id')); // Finding no plans. - $plans = plan::get_by_user_and_competency($u1->id, $c2->get_id()); + $plans = plan::get_by_user_and_competency($u1->id, $c2->get('id')); $this->assertCount(0, $plans); } @@ -543,34 +543,34 @@ class core_competency_plan_testcase extends advanced_testcase { $u4 = $dg->create_user(); $f1 = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $f1->get('id'))); $tpl1 = $lpg->create_template(); $p1 = $lpg->create_plan(array('userid' => $u1->id)); $p2 = $lpg->create_plan(array('userid' => $u2->id)); - $p3 = $lpg->create_plan(array('userid' => $u3->id, 'templateid' => $tpl1->get_id())); - $p4 = $lpg->create_plan(array('userid' => $u4->id, 'templateid' => $tpl1->get_id())); + $p3 = $lpg->create_plan(array('userid' => $u3->id, 'templateid' => $tpl1->get('id'))); + $p4 = $lpg->create_plan(array('userid' => $u4->id, 'templateid' => $tpl1->get('id'))); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $p2->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_template_competency(array('templateid' => $tpl1->get_id(), 'competencyid' => $c3->get_id())); - $lpg->create_template_competency(array('templateid' => $tpl1->get_id(), 'competencyid' => $c4->get_id())); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $p2->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_template_competency(array('templateid' => $tpl1->get('id'), 'competencyid' => $c3->get('id'))); + $lpg->create_template_competency(array('templateid' => $tpl1->get('id'), 'competencyid' => $c4->get('id'))); // Completing the plans and removing a competency from the template. api::complete_plan($p2); api::complete_plan($p4); - api::remove_competency_from_template($tpl1->get_id(), $c4->get_id()); + api::remove_competency_from_template($tpl1->get('id'), $c4->get('id')); // We can find all competencies. - $this->assertEquals($c1->to_record(), $p1->get_competency($c1->get_id())->to_record()); - $this->assertEquals($c2->to_record(), $p2->get_competency($c2->get_id())->to_record()); - $this->assertEquals($c3->to_record(), $p3->get_competency($c3->get_id())->to_record()); - $this->assertEquals($c4->to_record(), $p4->get_competency($c4->get_id())->to_record()); + $this->assertEquals($c1->to_record(), $p1->get_competency($c1->get('id'))->to_record()); + $this->assertEquals($c2->to_record(), $p2->get_competency($c2->get('id'))->to_record()); + $this->assertEquals($c3->to_record(), $p3->get_competency($c3->get('id'))->to_record()); + $this->assertEquals($c4->to_record(), $p4->get_competency($c4->get('id'))->to_record()); // Getting the competency 4 from the non-completed plan based on a template p4, will throw an exception. - $p3->get_competency($c4->get_id()); + $p3->get_competency($c4->get('id')); } } diff --git a/competency/tests/task_test.php b/competency/tests/task_test.php index 311a7efff58..d36b92691a9 100644 --- a/competency/tests/task_test.php +++ b/competency/tests/task_test.php @@ -65,8 +65,8 @@ class core_competency_task_testcase extends advanced_testcase { cohort_add_member($cohort->id, $user2->id); // Creating plans from template cohort. - $templatecohort = api::create_template_cohort($tpl->get_id(), $cohort->id); - $created = api::create_plans_from_template_cohort($tpl->get_id(), $cohort->id); + $templatecohort = api::create_template_cohort($tpl->get('id'), $cohort->id); + $created = api::create_plans_from_template_cohort($tpl->get('id'), $cohort->id); $this->assertEquals(2, $created); @@ -81,7 +81,7 @@ class core_competency_task_testcase extends advanced_testcase { $task->execute(); $task->set_last_run_time($currenttime); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Test if remove user from cohort will affect plans. cohort_remove_member($cohort->id, $user3->id); @@ -90,49 +90,49 @@ class core_competency_task_testcase extends advanced_testcase { $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // The template is now hidden, and I've added a user with a missing plan. Nothing should happen. $currenttime = $currenttime + 1; - $tpl->set_visible(false); + $tpl->set('visible', false); $tpl->update(); - $DB->execute($tplsql, array('currenttime' => $currenttime, 'templateid' => $tpl->get_id())); + $DB->execute($tplsql, array('currenttime' => $currenttime, 'templateid' => $tpl->get('id'))); $currenttime = $currenttime + 1; cohort_add_member($cohort->id, $user5->id); $DB->execute($cmsql, array('currenttime' => $currenttime, 'cohortid' => $cohort->id, 'userid' => $user5->id)); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Now I set the template as visible again, the plan is created. $currenttime = $currenttime + 1; - $tpl->set_visible(true); + $tpl->set('visible', true); $tpl->update(); - $DB->execute($tplsql, array('currenttime' => $currenttime, 'templateid' => $tpl->get_id())); + $DB->execute($tplsql, array('currenttime' => $currenttime, 'templateid' => $tpl->get('id'))); $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); - $this->assertTrue(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(5, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertTrue(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(5, plan::count_records(array('templateid' => $tpl->get('id')))); // Let's unlink the plan and run the task again, it should not be recreated. $currenttime = $currenttime + 1; - $plan = plan::get_record(array('userid' => $user5->id, 'templateid' => $tpl->get_id())); + $plan = plan::get_record(array('userid' => $user5->id, 'templateid' => $tpl->get('id'))); \core_competency\api::unlink_plan_from_template($plan); - $DB->execute($plansql, array('currenttime' => $currenttime, 'planid' => $plan->get_id())); + $DB->execute($plansql, array('currenttime' => $currenttime, 'planid' => $plan->get('id'))); $this->assertTrue(plan::record_exists_select('userid = ?', array($user5->id))); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); $this->assertTrue(plan::record_exists_select('userid = ?', array($user5->id))); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Adding users to cohort that already exist in plans. $currenttime = $currenttime + 1; @@ -144,16 +144,16 @@ class core_competency_task_testcase extends advanced_testcase { $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Test a user plan deleted will not be recreated. $currenttime = $currenttime + 1; - $plan = plan::get_record(array('userid' => $user4->id, 'templateid' => $tpl->get_id())); - \core_competency\api::delete_plan($plan->get_id()); + $plan = plan::get_record(array('userid' => $user4->id, 'templateid' => $tpl->get('id'))); + \core_competency\api::delete_plan($plan->get('id')); $currenttime = $currenttime + 1; $task->execute(); $task->set_last_run_time($currenttime); - $this->assertEquals(3, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(3, plan::count_records(array('templateid' => $tpl->get('id')))); } public function test_sync_plans_from_cohorts_with_templateduedate_task() { @@ -176,8 +176,8 @@ class core_competency_task_testcase extends advanced_testcase { cohort_add_member($cohort->id, $user2->id); // Creating plans from template cohort. - $templatecohort = api::create_template_cohort($tpl->get_id(), $cohort->id); - $created = api::create_plans_from_template_cohort($tpl->get_id(), $cohort->id); + $templatecohort = api::create_template_cohort($tpl->get('id'), $cohort->id); + $created = api::create_plans_from_template_cohort($tpl->get('id'), $cohort->id); $this->assertEquals(2, $created); @@ -190,49 +190,49 @@ class core_competency_task_testcase extends advanced_testcase { $task->execute(); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Test if remove user from cohort will affect plans. cohort_remove_member($cohort->id, $user3->id); cohort_remove_member($cohort->id, $user4->id); $task->execute(); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // The template is now hidden, and I've added a user with a missing plan. Nothing should happen. - $tpl->set_visible(false); + $tpl->set('visible', false); $tpl->update(); cohort_add_member($cohort->id, $user5->id); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); $task->execute(); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Now I set the template as visible again, the plan is created. - $tpl->set_visible(true); + $tpl->set('visible', true); $tpl->update(); $task->execute(); - $this->assertTrue(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(5, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertTrue(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(5, plan::count_records(array('templateid' => $tpl->get('id')))); // Let's unlink the plan and run the task again, it should not be recreated. - $plan = plan::get_record(array('userid' => $user5->id, 'templateid' => $tpl->get_id())); + $plan = plan::get_record(array('userid' => $user5->id, 'templateid' => $tpl->get('id'))); \core_competency\api::unlink_plan_from_template($plan); $this->assertTrue(plan::record_exists_select('userid = ?', array($user5->id))); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); $task->execute(); $this->assertTrue(plan::record_exists_select('userid = ?', array($user5->id))); - $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get_id()))); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertFalse(plan::record_exists_select('userid = ? AND templateid = ?', array($user5->id, $tpl->get('id')))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); // Adding users to cohort that already exist in plans. cohort_add_member($cohort->id, $user3->id); cohort_add_member($cohort->id, $user4->id); $task->execute(); - $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get_id()))); + $this->assertEquals(4, plan::count_records(array('templateid' => $tpl->get('id')))); } public function test_sync_plans_from_cohorts_with_passed_duedate() { @@ -247,7 +247,7 @@ class core_competency_task_testcase extends advanced_testcase { $user2 = $dg->create_user(); $cohort = $dg->create_cohort(); $tpl = $lpg->create_template(array('duedate' => time() + 1000)); - $templatecohort = api::create_template_cohort($tpl->get_id(), $cohort->id); + $templatecohort = api::create_template_cohort($tpl->get('id'), $cohort->id); $task = \core\task\manager::get_scheduled_task('\\core\\task\\sync_plans_from_template_cohorts_task'); // Add 1 user to the cohort. @@ -267,7 +267,7 @@ class core_competency_task_testcase extends advanced_testcase { $this->assertEquals(1, \core_competency\plan::count_records()); // Still only one plan. // Pretend it wasn't expired. - $tpl->set_duedate(time() + 100); + $tpl->set('duedate', time() + 100); $tpl->update(); $task->execute(); $this->assertEquals(2, \core_competency\plan::count_records()); // Now there is two. @@ -302,13 +302,13 @@ class core_competency_task_testcase extends advanced_testcase { // Test that draft plan can not be completed on running task. $task->execute(); - $plandraft = api::read_plan($up1->get_id()); - $this->assertEquals(\core_competency\plan::STATUS_DRAFT, $plandraft->get_status()); + $plandraft = api::read_plan($up1->get('id')); + $this->assertEquals(\core_competency\plan::STATUS_DRAFT, $plandraft->get('status')); // Test that active plan can be completed on running task. $task->execute(); - $planactive = api::read_plan($up2->get_id()); - $this->assertEquals(\core_competency\plan::STATUS_COMPLETE, $planactive->get_status()); + $planactive = api::read_plan($up2->get('id')); + $this->assertEquals(\core_competency\plan::STATUS_COMPLETE, $planactive->get('status')); } } diff --git a/competency/tests/template_test.php b/competency/tests/template_test.php index 217a68d45a6..5ac64e0f26f 100644 --- a/competency/tests/template_test.php +++ b/competency/tests/template_test.php @@ -43,42 +43,42 @@ class core_competency_template_testcase extends advanced_testcase { $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template(); // No due date -> pass. - $tpl->set_duedate(0); + $tpl->set('duedate', 0); $this->assertTrue($tpl->is_valid()); // Setting new due date in the past -> fail. - $tpl->set_duedate(1); + $tpl->set('duedate', 1); $errors = $tpl->get_errors(); $this->assertCount(1, $errors); $this->assertArrayHasKey('duedate', $errors); // Setting new due date in very close past -> pass. - $tpl->set_duedate(time() - 10); + $tpl->set('duedate', time() - 10); $this->assertTrue($tpl->is_valid()); // Setting new due date in future -> pass. - $tpl->set_duedate(time() + 600); + $tpl->set('duedate', time() + 600); $this->assertTrue($tpl->is_valid()); // Save due date in the future. $tpl->update(); // Going from future date to past -> fail. - $tpl->set_duedate(1); + $tpl->set('duedate', 1); $errors = $tpl->get_errors(); $this->assertCount(1, $errors); $this->assertArrayHasKey('duedate', $errors); // Going from future date to none -> pass. - $tpl->set_duedate(0); + $tpl->set('duedate', 0); $this->assertTrue($tpl->is_valid()); // Going from future date to other future -> pass. - $tpl->set_duedate(time() + 6000); + $tpl->set('duedate', time() + 6000); $this->assertTrue($tpl->is_valid()); // Going from future date to close past -> pass. - $tpl->set_duedate(time() - 10); + $tpl->set('duedate', time() - 10); $this->assertTrue($tpl->is_valid()); // Mocking past due date. @@ -86,30 +86,30 @@ class core_competency_template_testcase extends advanced_testcase { $record->duedate = 1; $DB->update_record(template::TABLE, $record); $tpl->read(); - $this->assertEquals(1, $tpl->get_duedate()); + $this->assertEquals(1, $tpl->get('duedate')); // Not changing the past due date -> pass. // Note: changing visibility to force validation. - $tpl->set_visible(0); - $tpl->set_visible(1); + $tpl->set('visible', 0); + $tpl->set('visible', 1); $this->assertTrue($tpl->is_valid()); // Changing past due date to other past -> fail. - $tpl->set_duedate(10); + $tpl->set('duedate', 10); $errors = $tpl->get_errors(); $this->assertCount(1, $errors); $this->assertArrayHasKey('duedate', $errors); // Changing past due date close past -> pass. - $tpl->set_duedate(time() + 10); + $tpl->set('duedate', time() + 10); $this->assertTrue($tpl->is_valid()); // Changing past due date to future -> pass. - $tpl->set_duedate(time() + 1000); + $tpl->set('duedate', time() + 1000); $this->assertTrue($tpl->is_valid()); // Changing past due date to none -> pass. - $tpl->set_duedate(0); + $tpl->set('duedate', 0); $this->assertTrue($tpl->is_valid()); } } diff --git a/competency/tests/user_evidence_competency_test.php b/competency/tests/user_evidence_competency_test.php index fe892ed9808..8d4766cb83f 100644 --- a/competency/tests/user_evidence_competency_test.php +++ b/competency/tests/user_evidence_competency_test.php @@ -47,46 +47,46 @@ class core_competency_user_evidence_competency_testcase extends advanced_testcas // Create framework with competencies. $fw = $lpg->create_framework(); - $c1 = $lpg->create_competency(array('competencyframeworkid' => $fw->get_id())); - $c2 = $lpg->create_competency(array('competencyframeworkid' => $fw->get_id())); - $c3 = $lpg->create_competency(array('competencyframeworkid' => $fw->get_id())); - $c4 = $lpg->create_competency(array('competencyframeworkid' => $fw->get_id())); + $c1 = $lpg->create_competency(array('competencyframeworkid' => $fw->get('id'))); + $c2 = $lpg->create_competency(array('competencyframeworkid' => $fw->get('id'))); + $c3 = $lpg->create_competency(array('competencyframeworkid' => $fw->get('id'))); + $c4 = $lpg->create_competency(array('competencyframeworkid' => $fw->get('id'))); // Create a plan with competencies. $p1 = $lpg->create_plan(array('userid' => $u1->id)); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c1->get_id())); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c2->get_id())); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c3->get_id())); - $lpg->create_plan_competency(array('planid' => $p1->get_id(), 'competencyid' => $c4->get_id())); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c1->get('id'))); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c2->get('id'))); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c3->get('id'))); + $lpg->create_plan_competency(array('planid' => $p1->get('id'), 'competencyid' => $c4->get('id'))); // Create a prior learning evidence and link competencies. $ue1 = $lpg->create_user_evidence(array('userid' => $u1->id)); - $uec11 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get_id(), 'competencyid' => $c1->get_id())); - $uec12 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get_id(), 'competencyid' => $c2->get_id())); - $uec13 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get_id(), 'competencyid' => $c3->get_id())); - $uc11 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c1->get_id())); - $uc12 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c2->get_id())); - $uc13 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get_id())); + $uec11 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get('id'), 'competencyid' => $c1->get('id'))); + $uec12 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get('id'), 'competencyid' => $c2->get('id'))); + $uec13 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue1->get('id'), 'competencyid' => $c3->get('id'))); + $uc11 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c1->get('id'))); + $uc12 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c2->get('id'))); + $uc13 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c3->get('id'))); // Create an other prior learning evidence and link competencies. $ue2 = $lpg->create_user_evidence(array('userid' => $u1->id)); - $uec22 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue2->get_id(), 'competencyid' => $c4->get_id())); - $uc22 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c4->get_id())); + $uec22 = $lpg->create_user_evidence_competency(array('userevidenceid' => $ue2->get('id'), 'competencyid' => $c4->get('id'))); + $uc22 = $lpg->create_user_competency(array('userid' => $u1->id, 'competencyid' => $c4->get('id'))); // Check the user competencies associated to the first prior learning evidence. - $ucs = user_evidence_competency::get_user_competencies_by_userevidenceid($ue1->get_id()); + $ucs = user_evidence_competency::get_user_competencies_by_userevidenceid($ue1->get('id')); $this->assertCount(3, $ucs); $uc = array_shift($ucs); - $this->assertEquals($uc->get_id(), $uc11->get_id()); + $this->assertEquals($uc->get('id'), $uc11->get('id')); $uc = array_shift($ucs); - $this->assertEquals($uc->get_id(), $uc12->get_id()); + $this->assertEquals($uc->get('id'), $uc12->get('id')); $uc = array_shift($ucs); - $this->assertEquals($uc->get_id(), $uc13->get_id()); + $this->assertEquals($uc->get('id'), $uc13->get('id')); // Check the user competencies associated to the second prior learning evidence. - $ucs = user_evidence_competency::get_user_competencies_by_userevidenceid($ue2->get_id()); + $ucs = user_evidence_competency::get_user_competencies_by_userevidenceid($ue2->get('id')); $this->assertCount(1, $ucs); $uc = array_shift($ucs); - $this->assertEquals($uc->get_id(), $uc22->get_id()); + $this->assertEquals($uc->get('id'), $uc22->get('id')); } } diff --git a/lib/classes/event/competency_created.php b/lib/classes/event/competency_created.php index 0ada2d4225c..ee2a6bc9d1a 100644 --- a/lib/classes/event/competency_created.php +++ b/lib/classes/event/competency_created.php @@ -47,12 +47,12 @@ class competency_created extends base { * @return self */ public static function create_from_competency(competency $competency) { - if (!$competency->get_id()) { + if (!$competency->get('id')) { throw new \coding_exception('The competency ID must be set.'); } $event = static::create(array( 'contextid' => $competency->get_context()->id, - 'objectid' => $competency->get_id() + 'objectid' => $competency->get('id') )); $event->add_record_snapshot(competency::TABLE, $competency->to_record()); return $event; diff --git a/lib/classes/event/competency_deleted.php b/lib/classes/event/competency_deleted.php index 032a8fb61de..9779ed25bc8 100644 --- a/lib/classes/event/competency_deleted.php +++ b/lib/classes/event/competency_deleted.php @@ -46,12 +46,12 @@ class competency_deleted extends base { * @return self */ public static function create_from_competency(competency $competency) { - if (!$competency->get_id()) { + if (!$competency->get('id')) { throw new \coding_exception('The competency ID must be set.'); } $event = static::create(array( 'contextid' => $competency->get_context()->id, - 'objectid' => $competency->get_id(), + 'objectid' => $competency->get('id'), )); $event->add_record_snapshot(competency::TABLE, $competency->to_record()); return $event; diff --git a/lib/classes/event/competency_evidence_created.php b/lib/classes/event/competency_evidence_created.php index 605754cb26b..db31444f3a8 100644 --- a/lib/classes/event/competency_evidence_created.php +++ b/lib/classes/event/competency_evidence_created.php @@ -59,29 +59,29 @@ class competency_evidence_created extends base { */ public static final function create_from_evidence(evidence $evidence, user_competency $usercompetency, $recommend) { // Make sure we have a valid evidence. - if (!$evidence->get_id()) { + if (!$evidence->get('id')) { throw new \coding_exception('The evidence ID must be set.'); } // Make sure we have a valid user competency. - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } // Make sure that the a proper user competecy is linked to the evidence. - if ($evidence->get_usercompetencyid() != $usercompetency->get_id()) { + if ($evidence->get('usercompetencyid') != $usercompetency->get('id')) { throw new \coding_exception('The user competency linked with this evidence is invalid.'); } $event = static::create([ - 'contextid' => $evidence->get_contextid(), - 'objectid' => $evidence->get_id(), - 'userid' => $evidence->get_actionuserid(), - 'relateduserid' => $usercompetency->get_userid(), + 'contextid' => $evidence->get('contextid'), + 'objectid' => $evidence->get('id'), + 'userid' => $evidence->get('actionuserid'), + 'relateduserid' => $usercompetency->get('userid'), 'other' => [ - 'usercompetencyid' => $usercompetency->get_id(), - 'competencyid' => $usercompetency->get_competencyid(), - 'action' => $evidence->get_action(), + 'usercompetencyid' => $usercompetency->get('id'), + 'competencyid' => $usercompetency->get('competencyid'), + 'action' => $evidence->get('action'), 'recommend' => $recommend ] ]); diff --git a/lib/classes/event/competency_framework_created.php b/lib/classes/event/competency_framework_created.php index 66ea6a8a0cb..efa849fa6a8 100644 --- a/lib/classes/event/competency_framework_created.php +++ b/lib/classes/event/competency_framework_created.php @@ -49,12 +49,12 @@ class competency_framework_created extends base { * @return self */ public static final function create_from_framework(competency_framework $framework) { - if (!$framework->get_id()) { + if (!$framework->get('id')) { throw new \coding_exception('The competency framework ID must be set.'); } $event = static::create(array( - 'contextid' => $framework->get_contextid(), - 'objectid' => $framework->get_id() + 'contextid' => $framework->get('contextid'), + 'objectid' => $framework->get('id') )); $event->add_record_snapshot(competency_framework::TABLE, $framework->to_record()); return $event; diff --git a/lib/classes/event/competency_framework_deleted.php b/lib/classes/event/competency_framework_deleted.php index 473b1a93a4e..14aae7a8f3b 100644 --- a/lib/classes/event/competency_framework_deleted.php +++ b/lib/classes/event/competency_framework_deleted.php @@ -50,12 +50,12 @@ class competency_framework_deleted extends base { * @return self */ public static final function create_from_framework(competency_framework $framework) { - if (!$framework->get_id()) { + if (!$framework->get('id')) { throw new \coding_exception('The competency framework ID must be set.'); } $event = static::create(array( - 'contextid' => $framework->get_contextid(), - 'objectid' => $framework->get_id() + 'contextid' => $framework->get('contextid'), + 'objectid' => $framework->get('id') )); $event->add_record_snapshot(competency_framework::TABLE, $framework->to_record()); return $event; diff --git a/lib/classes/event/competency_framework_updated.php b/lib/classes/event/competency_framework_updated.php index 8b81ac1b500..641a04f31ce 100644 --- a/lib/classes/event/competency_framework_updated.php +++ b/lib/classes/event/competency_framework_updated.php @@ -50,12 +50,12 @@ class competency_framework_updated extends base { * @return self */ public static final function create_from_framework(competency_framework $framework) { - if (!$framework->get_id()) { + if (!$framework->get('id')) { throw new \coding_exception('The competency framework ID must be set.'); } $event = static::create(array( - 'contextid' => $framework->get_contextid(), - 'objectid' => $framework->get_id() + 'contextid' => $framework->get('contextid'), + 'objectid' => $framework->get('id') )); $event->add_record_snapshot(competency_framework::TABLE, $framework->to_record()); return $event; diff --git a/lib/classes/event/competency_framework_viewed.php b/lib/classes/event/competency_framework_viewed.php index 3034de163ba..f019bd1ffba 100644 --- a/lib/classes/event/competency_framework_viewed.php +++ b/lib/classes/event/competency_framework_viewed.php @@ -46,12 +46,12 @@ class competency_framework_viewed extends base { * @return self */ public static function create_from_framework(competency_framework $framework) { - if (!$framework->get_id()) { + if (!$framework->get('id')) { throw new \coding_exception('The competency framework ID must be set.'); } $event = static::create(array( - 'contextid' => $framework->get_contextid(), - 'objectid' => $framework->get_id() + 'contextid' => $framework->get('contextid'), + 'objectid' => $framework->get('id') )); $event->add_record_snapshot(competency_framework::TABLE, $framework->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_approved.php b/lib/classes/event/competency_plan_approved.php index 1c7ab025d54..23ba369be76 100644 --- a/lib/classes/event/competency_plan_approved.php +++ b/lib/classes/event/competency_plan_approved.php @@ -51,13 +51,13 @@ class competency_plan_approved extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_completed.php b/lib/classes/event/competency_plan_completed.php index 4de68a2760e..e0072406da8 100644 --- a/lib/classes/event/competency_plan_completed.php +++ b/lib/classes/event/competency_plan_completed.php @@ -51,13 +51,13 @@ class competency_plan_completed extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_created.php b/lib/classes/event/competency_plan_created.php index 762bd158028..8433342ca19 100644 --- a/lib/classes/event/competency_plan_created.php +++ b/lib/classes/event/competency_plan_created.php @@ -49,12 +49,12 @@ class competency_plan_created extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id() + 'objectid' => $plan->get('id') )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_deleted.php b/lib/classes/event/competency_plan_deleted.php index 0814ec208ab..c6db4b7be6d 100644 --- a/lib/classes/event/competency_plan_deleted.php +++ b/lib/classes/event/competency_plan_deleted.php @@ -50,12 +50,12 @@ class competency_plan_deleted extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id() + 'objectid' => $plan->get('id') )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_reopened.php b/lib/classes/event/competency_plan_reopened.php index 016965ba9b5..a37f6541af7 100644 --- a/lib/classes/event/competency_plan_reopened.php +++ b/lib/classes/event/competency_plan_reopened.php @@ -51,13 +51,13 @@ class competency_plan_reopened extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_review_request_cancelled.php b/lib/classes/event/competency_plan_review_request_cancelled.php index 212c447b6a1..149e78cff1d 100644 --- a/lib/classes/event/competency_plan_review_request_cancelled.php +++ b/lib/classes/event/competency_plan_review_request_cancelled.php @@ -51,13 +51,13 @@ class competency_plan_review_request_cancelled extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_review_requested.php b/lib/classes/event/competency_plan_review_requested.php index 537d85dd23d..da40ff5d708 100644 --- a/lib/classes/event/competency_plan_review_requested.php +++ b/lib/classes/event/competency_plan_review_requested.php @@ -51,13 +51,13 @@ class competency_plan_review_requested extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_review_started.php b/lib/classes/event/competency_plan_review_started.php index a0cee7a18c9..772d98e9944 100644 --- a/lib/classes/event/competency_plan_review_started.php +++ b/lib/classes/event/competency_plan_review_started.php @@ -51,13 +51,13 @@ class competency_plan_review_started extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_review_stopped.php b/lib/classes/event/competency_plan_review_stopped.php index da3f8740da8..95a5fe23265 100644 --- a/lib/classes/event/competency_plan_review_stopped.php +++ b/lib/classes/event/competency_plan_review_stopped.php @@ -51,13 +51,13 @@ class competency_plan_review_stopped extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_unapproved.php b/lib/classes/event/competency_plan_unapproved.php index 51be01d1ea6..2ae8264e55f 100644 --- a/lib/classes/event/competency_plan_unapproved.php +++ b/lib/classes/event/competency_plan_unapproved.php @@ -51,13 +51,13 @@ class competency_plan_unapproved extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_unlinked.php b/lib/classes/event/competency_plan_unlinked.php index 58469cd5a85..e9e9231848d 100644 --- a/lib/classes/event/competency_plan_unlinked.php +++ b/lib/classes/event/competency_plan_unlinked.php @@ -48,13 +48,13 @@ class competency_plan_unlinked extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id(), - 'relateduserid' => $plan->get_userid(), + 'objectid' => $plan->get('id'), + 'relateduserid' => $plan->get('userid'), )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_updated.php b/lib/classes/event/competency_plan_updated.php index 5844adb4587..557597a6359 100644 --- a/lib/classes/event/competency_plan_updated.php +++ b/lib/classes/event/competency_plan_updated.php @@ -52,12 +52,12 @@ class competency_plan_updated extends base { * @return self */ public static final function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id() + 'objectid' => $plan->get('id') )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_plan_viewed.php b/lib/classes/event/competency_plan_viewed.php index 35d607744e2..83a5b8e3c86 100644 --- a/lib/classes/event/competency_plan_viewed.php +++ b/lib/classes/event/competency_plan_viewed.php @@ -49,12 +49,12 @@ class competency_plan_viewed extends base { * @return self */ public static function create_from_plan(plan $plan) { - if (!$plan->get_id()) { + if (!$plan->get('id')) { throw new \coding_exception('The plan ID must be set.'); } $event = static::create(array( 'contextid' => $plan->get_context()->id, - 'objectid' => $plan->get_id() + 'objectid' => $plan->get('id') )); $event->add_record_snapshot(plan::TABLE, $plan->to_record()); return $event; diff --git a/lib/classes/event/competency_template_created.php b/lib/classes/event/competency_template_created.php index 471bcb64d57..32be964c499 100644 --- a/lib/classes/event/competency_template_created.php +++ b/lib/classes/event/competency_template_created.php @@ -49,12 +49,12 @@ class competency_template_created extends base { * @return self */ public static final function create_from_template(template $template) { - if (!$template->get_id()) { + if (!$template->get('id')) { throw new \coding_exception('The template ID must be set.'); } $event = static::create(array( - 'contextid' => $template->get_contextid(), - 'objectid' => $template->get_id() + 'contextid' => $template->get('contextid'), + 'objectid' => $template->get('id') )); $event->add_record_snapshot(template::TABLE, $template->to_record()); return $event; diff --git a/lib/classes/event/competency_template_deleted.php b/lib/classes/event/competency_template_deleted.php index 614f176786d..df024bde5bb 100644 --- a/lib/classes/event/competency_template_deleted.php +++ b/lib/classes/event/competency_template_deleted.php @@ -50,12 +50,12 @@ class competency_template_deleted extends base { * @return self */ public static final function create_from_template(template $template) { - if (!$template->get_id()) { + if (!$template->get('id')) { throw new \coding_exception('The template ID must be set.'); } $event = static::create(array( - 'contextid' => $template->get_contextid(), - 'objectid' => $template->get_id() + 'contextid' => $template->get('contextid'), + 'objectid' => $template->get('id') )); $event->add_record_snapshot(template::TABLE, $template->to_record()); return $event; diff --git a/lib/classes/event/competency_template_updated.php b/lib/classes/event/competency_template_updated.php index 209c0b06668..b9f41f2ba3f 100644 --- a/lib/classes/event/competency_template_updated.php +++ b/lib/classes/event/competency_template_updated.php @@ -52,12 +52,12 @@ class competency_template_updated extends base { * @return self */ public static final function create_from_template(template $template) { - if (!$template->get_id()) { + if (!$template->get('id')) { throw new \coding_exception('The template ID must be set.'); } $event = static::create(array( - 'contextid' => $template->get_contextid(), - 'objectid' => $template->get_id() + 'contextid' => $template->get('contextid'), + 'objectid' => $template->get('id') )); $event->add_record_snapshot(template::TABLE, $template->to_record()); return $event; diff --git a/lib/classes/event/competency_template_viewed.php b/lib/classes/event/competency_template_viewed.php index f444d1c5bef..b959c76466a 100644 --- a/lib/classes/event/competency_template_viewed.php +++ b/lib/classes/event/competency_template_viewed.php @@ -49,12 +49,12 @@ class competency_template_viewed extends base { * @return self */ public static function create_from_template(template $template) { - if (!$template->get_id()) { + if (!$template->get('id')) { throw new \coding_exception('The template ID must be set.'); } $event = static::create(array( - 'contextid' => $template->get_contextid(), - 'objectid' => $template->get_id() + 'contextid' => $template->get('contextid'), + 'objectid' => $template->get('id') )); $event->add_record_snapshot(template::TABLE, $template->to_record()); return $event; diff --git a/lib/classes/event/competency_updated.php b/lib/classes/event/competency_updated.php index d1478892409..cee15a40a1b 100644 --- a/lib/classes/event/competency_updated.php +++ b/lib/classes/event/competency_updated.php @@ -47,12 +47,12 @@ class competency_updated extends base { * @return self */ public static function create_from_competency(competency $competency) { - if (!$competency->get_id()) { + if (!$competency->get('id')) { throw new \coding_exception('The competency ID must be set.'); } $event = static::create(array( 'contextid' => $competency->get_context()->id, - 'objectid' => $competency->get_id() + 'objectid' => $competency->get('id') )); $event->add_record_snapshot(competency::TABLE, $competency->to_record()); return $event; diff --git a/lib/classes/event/competency_user_competency_plan_viewed.php b/lib/classes/event/competency_user_competency_plan_viewed.php index 94fa3419804..bdf190be256 100644 --- a/lib/classes/event/competency_user_competency_plan_viewed.php +++ b/lib/classes/event/competency_user_competency_plan_viewed.php @@ -53,16 +53,16 @@ class competency_user_competency_plan_viewed extends base { * @return self */ public static function create_from_user_competency_plan(user_competency_plan $usercompetencyplan) { - if (!$usercompetencyplan->get_id()) { + if (!$usercompetencyplan->get('id')) { throw new \coding_exception('The user competency plan ID must be set.'); } $event = static::create(array( 'contextid' => $usercompetencyplan->get_context()->id, - 'objectid' => $usercompetencyplan->get_id(), - 'relateduserid' => $usercompetencyplan->get_userid(), + 'objectid' => $usercompetencyplan->get('id'), + 'relateduserid' => $usercompetencyplan->get('userid'), 'other' => array( - 'planid' => $usercompetencyplan->get_planid(), - 'competencyid' => $usercompetencyplan->get_competencyid() + 'planid' => $usercompetencyplan->get('planid'), + 'competencyid' => $usercompetencyplan->get('competencyid') ) )); $event->add_record_snapshot(user_competency_plan::TABLE, $usercompetencyplan->to_record()); diff --git a/lib/classes/event/competency_user_competency_rated.php b/lib/classes/event/competency_user_competency_rated.php index 1136d83cf1b..0f98628c3c8 100644 --- a/lib/classes/event/competency_user_competency_rated.php +++ b/lib/classes/event/competency_user_competency_rated.php @@ -51,16 +51,16 @@ class competency_user_competency_rated extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid(), + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid'), 'other' => array( - 'grade' => $usercompetency->get_grade() + 'grade' => $usercompetency->get('grade') ) ); diff --git a/lib/classes/event/competency_user_competency_rated_in_course.php b/lib/classes/event/competency_user_competency_rated_in_course.php index 7cdae3aa020..d2f747c45f3 100644 --- a/lib/classes/event/competency_user_competency_rated_in_course.php +++ b/lib/classes/event/competency_user_competency_rated_in_course.php @@ -53,21 +53,21 @@ class competency_user_competency_rated_in_course extends base { * @return self */ public static function create_from_user_competency_course(user_competency_course $usercompetencycourse) { - if (!$usercompetencycourse->get_id()) { + if (!$usercompetencycourse->get('id')) { throw new \coding_exception('The user competency course ID must be set.'); } $params = array( - 'objectid' => $usercompetencycourse->get_id(), - 'relateduserid' => $usercompetencycourse->get_userid(), + 'objectid' => $usercompetencycourse->get('id'), + 'relateduserid' => $usercompetencycourse->get('userid'), 'other' => array( - 'competencyid' => $usercompetencycourse->get_competencyid(), - 'grade' => $usercompetencycourse->get_grade() + 'competencyid' => $usercompetencycourse->get('competencyid'), + 'grade' => $usercompetencycourse->get('grade') ) ); - $coursecontext = context_course::instance($usercompetencycourse->get_courseid()); + $coursecontext = context_course::instance($usercompetencycourse->get('courseid')); $params['contextid'] = $coursecontext->id; - $params['courseid'] = $usercompetencycourse->get_courseid(); + $params['courseid'] = $usercompetencycourse->get('courseid'); $event = static::create($params); $event->add_record_snapshot(user_competency_course::TABLE, $usercompetencycourse->to_record()); diff --git a/lib/classes/event/competency_user_competency_rated_in_plan.php b/lib/classes/event/competency_user_competency_rated_in_plan.php index 1d75614ed6f..7de7f25c702 100644 --- a/lib/classes/event/competency_user_competency_rated_in_plan.php +++ b/lib/classes/event/competency_user_competency_rated_in_plan.php @@ -54,17 +54,17 @@ class competency_user_competency_rated_in_plan extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency, $planid) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid(), + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid'), 'other' => array( - 'competencyid' => $usercompetency->get_competencyid(), - 'grade' => $usercompetency->get_grade(), + 'competencyid' => $usercompetency->get('competencyid'), + 'grade' => $usercompetency->get('grade'), 'planid' => $planid ) ); diff --git a/lib/classes/event/competency_user_competency_review_request_cancelled.php b/lib/classes/event/competency_user_competency_review_request_cancelled.php index a35f962e9d1..89a78438af4 100644 --- a/lib/classes/event/competency_user_competency_review_request_cancelled.php +++ b/lib/classes/event/competency_user_competency_review_request_cancelled.php @@ -46,13 +46,13 @@ class competency_user_competency_review_request_cancelled extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid() + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid') ); $event = static::create($params); diff --git a/lib/classes/event/competency_user_competency_review_requested.php b/lib/classes/event/competency_user_competency_review_requested.php index 42710426987..1247d07b1f4 100644 --- a/lib/classes/event/competency_user_competency_review_requested.php +++ b/lib/classes/event/competency_user_competency_review_requested.php @@ -46,13 +46,13 @@ class competency_user_competency_review_requested extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid() + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid') ); $event = static::create($params); diff --git a/lib/classes/event/competency_user_competency_review_started.php b/lib/classes/event/competency_user_competency_review_started.php index b887d6ae828..54ce08fe590 100644 --- a/lib/classes/event/competency_user_competency_review_started.php +++ b/lib/classes/event/competency_user_competency_review_started.php @@ -46,13 +46,13 @@ class competency_user_competency_review_started extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid() + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid') ); $event = static::create($params); diff --git a/lib/classes/event/competency_user_competency_review_stopped.php b/lib/classes/event/competency_user_competency_review_stopped.php index 560523facb6..738d1a66735 100644 --- a/lib/classes/event/competency_user_competency_review_stopped.php +++ b/lib/classes/event/competency_user_competency_review_stopped.php @@ -46,13 +46,13 @@ class competency_user_competency_review_stopped extends base { * @return self */ public static function create_from_user_competency(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid() + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid') ); $event = static::create($params); diff --git a/lib/classes/event/competency_user_competency_viewed.php b/lib/classes/event/competency_user_competency_viewed.php index c285e759b99..6e8ba223e29 100644 --- a/lib/classes/event/competency_user_competency_viewed.php +++ b/lib/classes/event/competency_user_competency_viewed.php @@ -52,15 +52,15 @@ class competency_user_competency_viewed extends base { * @return self */ public static function create_from_user_competency_viewed(user_competency $usercompetency) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid(), + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid'), 'other' => array( - 'competencyid' => $usercompetency->get_competencyid() + 'competencyid' => $usercompetency->get('competencyid') ) ); diff --git a/lib/classes/event/competency_user_competency_viewed_in_course.php b/lib/classes/event/competency_user_competency_viewed_in_course.php index 1081ab16655..1b6ef284ca0 100644 --- a/lib/classes/event/competency_user_competency_viewed_in_course.php +++ b/lib/classes/event/competency_user_competency_viewed_in_course.php @@ -52,19 +52,19 @@ class competency_user_competency_viewed_in_course extends base { * @return self */ public static function create_from_user_competency_viewed_in_course(user_competency_course $usercompetencycourse) { - if (!$usercompetencycourse->get_id()) { + if (!$usercompetencycourse->get('id')) { throw new \coding_exception('The user competency course ID must be set.'); } $params = array( - 'objectid' => $usercompetencycourse->get_id(), - 'relateduserid' => $usercompetencycourse->get_userid(), + 'objectid' => $usercompetencycourse->get('id'), + 'relateduserid' => $usercompetencycourse->get('userid'), 'other' => array( - 'competencyid' => $usercompetencycourse->get_competencyid() + 'competencyid' => $usercompetencycourse->get('competencyid') ) ); - $coursecontext = context_course::instance($usercompetencycourse->get_courseid()); + $coursecontext = context_course::instance($usercompetencycourse->get('courseid')); $params['contextid'] = $coursecontext->id; - $params['courseid'] = $usercompetencycourse->get_courseid(); + $params['courseid'] = $usercompetencycourse->get('courseid'); $event = static::create($params); $event->add_record_snapshot(user_competency_course::TABLE, $usercompetencycourse->to_record()); diff --git a/lib/classes/event/competency_user_competency_viewed_in_plan.php b/lib/classes/event/competency_user_competency_viewed_in_plan.php index de23838bd78..2f448e586b2 100644 --- a/lib/classes/event/competency_user_competency_viewed_in_plan.php +++ b/lib/classes/event/competency_user_competency_viewed_in_plan.php @@ -54,15 +54,15 @@ class competency_user_competency_viewed_in_plan extends base { * @return self */ public static function create_from_user_competency_viewed_in_plan(user_competency $usercompetency, $planid) { - if (!$usercompetency->get_id()) { + if (!$usercompetency->get('id')) { throw new \coding_exception('The user competency ID must be set.'); } $params = array( 'contextid' => $usercompetency->get_context()->id, - 'objectid' => $usercompetency->get_id(), - 'relateduserid' => $usercompetency->get_userid(), + 'objectid' => $usercompetency->get('id'), + 'relateduserid' => $usercompetency->get('userid'), 'other' => array( - 'competencyid' => $usercompetency->get_competencyid(), + 'competencyid' => $usercompetency->get('competencyid'), 'planid' => $planid ) ); diff --git a/lib/classes/event/competency_user_evidence_created.php b/lib/classes/event/competency_user_evidence_created.php index e9f5f7d0c03..9712cd4b5e3 100644 --- a/lib/classes/event/competency_user_evidence_created.php +++ b/lib/classes/event/competency_user_evidence_created.php @@ -49,13 +49,13 @@ class competency_user_evidence_created extends base { * @return self */ public static final function create_from_user_evidence(user_evidence $userevidence) { - if (!$userevidence->get_id()) { + if (!$userevidence->get('id')) { throw new \coding_exception('The evidence of prior learning ID must be set.'); } $event = static::create(array( 'contextid' => $userevidence->get_context()->id, - 'objectid' => $userevidence->get_id(), - 'relateduserid' => $userevidence->get_userid() + 'objectid' => $userevidence->get('id'), + 'relateduserid' => $userevidence->get('userid') )); $event->add_record_snapshot(user_evidence::TABLE, $userevidence->to_record()); return $event; diff --git a/lib/classes/event/competency_user_evidence_deleted.php b/lib/classes/event/competency_user_evidence_deleted.php index 84c047c8086..be009d8afc7 100644 --- a/lib/classes/event/competency_user_evidence_deleted.php +++ b/lib/classes/event/competency_user_evidence_deleted.php @@ -49,13 +49,13 @@ class competency_user_evidence_deleted extends base { * @return self */ public static final function create_from_user_evidence(user_evidence $userevidence) { - if (!$userevidence->get_id()) { + if (!$userevidence->get('id')) { throw new \coding_exception('The evidence of prior learning ID must be set.'); } $event = static::create(array( 'contextid' => $userevidence->get_context()->id, - 'objectid' => $userevidence->get_id(), - 'relateduserid' => $userevidence->get_userid() + 'objectid' => $userevidence->get('id'), + 'relateduserid' => $userevidence->get('userid') )); $event->add_record_snapshot(user_evidence::TABLE, $userevidence->to_record()); return $event; diff --git a/lib/classes/event/competency_user_evidence_updated.php b/lib/classes/event/competency_user_evidence_updated.php index d35f3fea643..69c25f20a70 100644 --- a/lib/classes/event/competency_user_evidence_updated.php +++ b/lib/classes/event/competency_user_evidence_updated.php @@ -49,13 +49,13 @@ class competency_user_evidence_updated extends base { * @return self */ public static final function create_from_user_evidence(user_evidence $userevidence) { - if (!$userevidence->get_id()) { + if (!$userevidence->get('id')) { throw new \coding_exception('The evidence of prior learning ID must be set.'); } $event = static::create(array( 'contextid' => $userevidence->get_context()->id, - 'objectid' => $userevidence->get_id(), - 'relateduserid' => $userevidence->get_userid() + 'objectid' => $userevidence->get('id'), + 'relateduserid' => $userevidence->get('userid') )); $event->add_record_snapshot(user_evidence::TABLE, $userevidence->to_record()); return $event; diff --git a/lib/classes/event/competency_viewed.php b/lib/classes/event/competency_viewed.php index da899a53215..1aa3b1f3e26 100644 --- a/lib/classes/event/competency_viewed.php +++ b/lib/classes/event/competency_viewed.php @@ -47,12 +47,12 @@ class competency_viewed extends base { * @return self */ public static function create_from_competency(competency $competency) { - if (!$competency->get_id()) { + if (!$competency->get('id')) { throw new \coding_exception('The competency ID must be set.'); } $event = static::create(array( 'contextid' => $competency->get_context()->id, - 'objectid' => $competency->get_id() + 'objectid' => $competency->get('id') )); $event->add_record_snapshot(competency::TABLE, $competency->to_record()); return $event; diff --git a/lib/classes/persistent.php b/lib/classes/persistent.php index 463e06efc24..5f670a1e43f 100644 --- a/lib/classes/persistent.php +++ b/lib/classes/persistent.php @@ -59,7 +59,7 @@ abstract class persistent { */ public function __construct($id = 0, stdClass $record = null) { if ($id > 0) { - $this->set('id', $id); + $this->raw_set('id', $id); $this->read(); } if (!empty($record)) { @@ -68,42 +68,66 @@ abstract class persistent { } /** - * Magic method to capture getters and setters. + * Data setter. * - * @param string $method Callee. - * @param array $arguments List of arguments. + * This is the main setter for all the properties. Developers can implement their own setters (set_propertyname) + * and they will be called by this function. Custom setters should call internal_set() to finally set the value. + * Internally this is not used {@link self::to_record()} or + * {@link self::from_record()} because the data is not expected to be validated or changed when reading/writing + * raw records from the DB. + * + * @param string $property The property name. * @return mixed */ - final public function __call($method, $arguments) { - if (strpos($method, 'get_') === 0) { - return $this->get(substr($method, 4)); - } else if (strpos($method, 'set_') === 0) { - return $this->set(substr($method, 4), $arguments[0]); + final public function set($property, $value) { + $methodname = 'set_' . $property; + if (method_exists($this, $methodname)) { + return $this->$methodname($value); } - throw new coding_exception('Unexpected method call: ' . $method); + return $this->raw_set($property, $value); } /** * Data getter. * + * This is the main getter for all the properties. Developers can implement their own getters (get_propertyname) + * and they will be called by this function. Custom getters can use raw_get to get the raw value. + * Internally this is not used by {@link self::to_record()} or + * {@link self::from_record()} because the data is not expected to be validated or changed when reading/writing + * raw records from the DB. + * + * @param string $property The property name. + * @return mixed + */ + final public function get($property) { + $methodname = 'get_' . $property; + if (method_exists($this, $methodname)) { + return $this->$methodname(); + } + return $this->raw_get($property); + } + + /** + * Internal Data getter. + * * This is the main getter for all the properties. Developers can implement their own getters * but they should be calling {@link self::get()} in order to retrieve the value. Essentially * the getters defined by the developers would only ever be used as helper methods and will not * be called internally at this stage. In other words, do not expect {@link self::to_record()} or * {@link self::from_record()} to use them. * - * This is protected because we wouldn't want the developers to get into the habit of - * using $persistent->get('property_name'), the lengthy getters must be used. + * This is protected because it is only for raw low level access to the data fields. + * Note this function is named raw_get and not get_raw to avoid naming clashes with a property named raw. * * @param string $property The property name. * @return mixed */ - final protected function get($property) { + final protected function raw_get($property) { if (!static::has_property($property)) { throw new coding_exception('Unexpected property \'' . s($property) .'\' requested.'); } if (!array_key_exists($property, $this->data) && !static::is_property_required($property)) { - $this->set($property, static::get_property_default_value($property)); + $this->raw_set($property, static::get_property_default_value($property)); } return isset($this->data[$property]) ? $this->data[$property] : null; } @@ -117,14 +141,13 @@ abstract class persistent { * at this stage. In other words do not expect {@link self::to_record()} or * {@link self::from_record()} to use them. * - * This is protected because we wouldn't want the developers to get into the habit of - * using $persistent->set('property_name', ''), the lengthy setters must be used. + * This is protected because it is only for raw low level access to the data fields. * * @param string $property The property name. * @param mixed $value The value. * @return mixed */ - final protected function set($property, $value) { + final protected function raw_set($property, $value) { if (!static::has_property($property)) { throw new coding_exception('Unexpected property \'' . s($property) .'\' requested.'); } @@ -329,7 +352,7 @@ abstract class persistent { final public function from_record(stdClass $record) { $record = (array) $record; foreach ($record as $property => $value) { - $this->set($property, $value); + $this->raw_set($property, $value); } return $this; } @@ -346,7 +369,7 @@ abstract class persistent { $data = new stdClass(); $properties = static::properties_definition(); foreach ($properties as $property => $definition) { - $data->$property = $this->get($property); + $data->$property = $this->raw_get($property); } return $data; } @@ -359,10 +382,10 @@ abstract class persistent { final public function read() { global $DB; - if ($this->get_id() <= 0) { + if ($this->get('id') <= 0) { throw new coding_exception('id is required to load'); } - $record = $DB->get_record(static::TABLE, array('id' => $this->get_id()), '*', MUST_EXIST); + $record = $DB->get_record(static::TABLE, array('id' => $this->get('id')), '*', MUST_EXIST); $this->from_record($record); // Validate the data as it comes from the database. @@ -392,7 +415,7 @@ abstract class persistent { final public function create() { global $DB, $USER; - if ($this->get_id()) { + if ($this->raw_get('id')) { // The validation methods rely on the ID to know if we're updating or not, the ID should be // falsy whenever we are creating an object. throw new coding_exception('Cannot create an object that has an ID defined.'); @@ -407,15 +430,15 @@ abstract class persistent { // We can safely set those values bypassing the validation because we know what we're doing. $now = time(); - $this->set('timecreated', $now); - $this->set('timemodified', $now); - $this->set('usermodified', $USER->id); + $this->raw_set('timecreated', $now); + $this->raw_set('timemodified', $now); + $this->raw_set('usermodified', $USER->id); $record = $this->to_record(); unset($record->id); $id = $DB->insert_record(static::TABLE, $record); - $this->set('id', $id); + $this->raw_set('id', $id); // We ensure that this is flagged as validated. $this->validated = true; @@ -457,7 +480,7 @@ abstract class persistent { final public function update() { global $DB, $USER; - if ($this->get_id() <= 0) { + if ($this->raw_get('id') <= 0) { throw new coding_exception('id is required to update'); } else if (!$this->is_valid()) { throw new invalid_persistent_exception($this->get_errors()); @@ -467,8 +490,8 @@ abstract class persistent { $this->before_update(); // We can safely set those values after the validation because we know what we're doing. - $this->set('timemodified', time()); - $this->set('usermodified', $USER->id); + $this->raw_set('timemodified', time()); + $this->raw_set('usermodified', $USER->id); $record = $this->to_record(); unset($record->timecreated); @@ -515,21 +538,21 @@ abstract class persistent { final public function delete() { global $DB; - if ($this->get_id() <= 0) { + if ($this->raw_get('id') <= 0) { throw new coding_exception('id is required to delete'); } // Hook before delete. $this->before_delete(); - $result = $DB->delete_records(static::TABLE, array('id' => $this->get_id())); + $result = $DB->delete_records(static::TABLE, array('id' => $this->raw_get('id'))); // Hook after delete. $this->after_delete($result); // Reset the ID to avoid any confusion, this also invalidates the model's data. if ($result) { - $this->set('id', 0); + $this->raw_set('id', 0); } return $result; @@ -602,7 +625,7 @@ abstract class persistent { foreach ($properties as $property => $definition) { // Get the data, bypassing the potential custom getter which could alter the data. - $value = $this->get($property); + $value = $this->raw_get($property); // Check if the property is required. if ($value === null && static::is_property_required($property)) { diff --git a/lib/tests/persistent_test.php b/lib/tests/persistent_test.php index ad88c028dd0..f2b96ff389b 100644 --- a/lib/tests/persistent_test.php +++ b/lib/tests/persistent_test.php @@ -197,7 +197,7 @@ class core_persistent_testcase extends advanced_testcase { $this->assertTrue(isset($p->beforevalidate)); $this->assertTrue($p->is_valid()); $this->assertEquals(array(), $p->get_errors()); - $p->set_descriptionformat(-100); + $p->set('descriptionformat', -100); $expected = array( 'descriptionformat' => new lang_string('invaliddata', 'error'), @@ -279,11 +279,11 @@ class core_persistent_testcase extends advanced_testcase { $this->assertFalse($p->is_valid()); $this->assertArrayHasKey('idnumber', $p->get_errors()); $this->assertArrayHasKey('scaleid', $p->get_errors()); - $p->set_idnumber('abc'); + $p->set('idnumber', 'abc'); $this->assertFalse($p->is_valid()); $this->assertArrayNotHasKey('idnumber', $p->get_errors()); $this->assertArrayHasKey('scaleid', $p->get_errors()); - $p->set_scaleid(null); + $p->set('scaleid', null); $this->assertTrue($p->is_valid()); $this->assertArrayNotHasKey('scaleid', $p->get_errors()); } @@ -294,7 +294,7 @@ class core_persistent_testcase extends advanced_testcase { $this->assertFalse(isset($p->beforecreate)); $this->assertFalse(isset($p->aftercreate)); $p->create(); - $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get_id()), '*', MUST_EXIST); + $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get('id')), '*', MUST_EXIST); $expected = $p->to_record(); $this->assertTrue(isset($p->beforecreate)); $this->assertTrue(isset($p->aftercreate)); @@ -308,15 +308,15 @@ class core_persistent_testcase extends advanced_testcase { global $DB; $p = new core_testable_persistent(0, (object) array('sortorder' => 123, 'idnumber' => 'abc')); $p->create(); - $id = $p->get_id(); - $p->set_sortorder(456); + $id = $p->get('id'); + $p->set('sortorder', 456); $p->from_record((object) array('idnumber' => 'def')); $this->assertFalse(isset($p->beforeupdate)); $this->assertFalse(isset($p->afterupdate)); $p->update(); $expected = $p->to_record(); - $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get_id()), '*', MUST_EXIST); + $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get('id')), '*', MUST_EXIST); $this->assertTrue(isset($p->beforeupdate)); $this->assertTrue(isset($p->afterupdate)); $this->assertEquals($id, $record->id); @@ -332,11 +332,11 @@ class core_persistent_testcase extends advanced_testcase { unset($p->beforecreate); unset($p->aftercreate); - $p2 = new core_testable_persistent($p->get_id()); + $p2 = new core_testable_persistent($p->get('id')); $this->assertEquals($p, $p2); $p3 = new core_testable_persistent(); - $p3->set_id($p->get_id()); + $p3->set('id', $p->get('id')); $p3->read(); $this->assertEquals($p, $p3); } @@ -346,14 +346,14 @@ class core_persistent_testcase extends advanced_testcase { $p = new core_testable_persistent(0, (object) array('sortorder' => 123, 'idnumber' => 'abc')); $p->create(); - $this->assertNotEquals(0, $p->get_id()); - $this->assertTrue($DB->record_exists_select(core_testable_persistent::TABLE, 'id = ?', array($p->get_id()))); + $this->assertNotEquals(0, $p->get('id')); + $this->assertTrue($DB->record_exists_select(core_testable_persistent::TABLE, 'id = ?', array($p->get('id')))); $this->assertFalse(isset($p->beforedelete)); $this->assertFalse(isset($p->afterdelete)); $p->delete(); - $this->assertFalse($DB->record_exists_select(core_testable_persistent::TABLE, 'id = ?', array($p->get_id()))); - $this->assertEquals(0, $p->get_id()); + $this->assertFalse($DB->record_exists_select(core_testable_persistent::TABLE, 'id = ?', array($p->get('id')))); + $this->assertEquals(0, $p->get('id')); $this->assertEquals(true, $p->beforedelete); $this->assertEquals(true, $p->afterdelete); } @@ -370,12 +370,12 @@ class core_persistent_testcase extends advanced_testcase { $json = json_encode($path); $p = new core_testable_persistent(0, (object) array('sortorder' => 0, 'idnumber' => 'abc')); - $p->set_path($path); - $this->assertEquals($path, $p->get_path()); + $p->set('path', $path); + $this->assertEquals($path, $p->get('path')); $this->assertEquals($json, $p->to_record()->path); $p->create(); - $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get_id()), 'id, path', MUST_EXIST); + $record = $DB->get_record(core_testable_persistent::TABLE, array('id' => $p->get('id')), 'id, path', MUST_EXIST); $this->assertEquals($json, $record->path); } @@ -384,7 +384,7 @@ class core_persistent_testcase extends advanced_testcase { $this->assertFalse($DB->record_exists(core_testable_persistent::TABLE, array('idnumber' => 'abc'))); $p = new core_testable_persistent(0, (object) array('sortorder' => 123, 'idnumber' => 'abc')); $p->create(); - $id = $p->get_id(); + $id = $p->get('id'); $this->assertTrue(core_testable_persistent::record_exists($id)); $this->assertTrue($DB->record_exists(core_testable_persistent::TABLE, array('idnumber' => 'abc'))); $p->delete(); @@ -495,7 +495,7 @@ class core_testable_persistent extends \core\persistent { } public function get_path() { - $value = $this->get('path'); + $value = $this->raw_get('path'); if (!empty($value)) { $value = json_decode($value); } @@ -506,7 +506,7 @@ class core_testable_persistent extends \core\persistent { if (!empty($value)) { $value = json_encode($value); } - $this->set('path', $value); + $this->raw_set('path', $value); } protected function validate_sortorder($value) { @@ -516,4 +516,4 @@ class core_testable_persistent extends \core\persistent { return true; } -} \ No newline at end of file +}