MDL-53700 competency: Use URL resolver in events

admin/tool/lp/classes/url_resolver.php

@@ -36,6 +36,34 @@
  */
 class url_resolver {
 
+    /**
+     * The URL where the competency can be found.
+     *
+     * @param int $competencyid The competency ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function competency($competencyid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/editcompetency.php', array(
+            'id' => $competencyid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
+    /**
+     * The URL where the framework can be found.
+     *
+     * @param int $frameworkid The framework ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function framework($frameworkid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/competencies.php', array(
+            'competencyframeworkid' => $frameworkid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
     /**
      * The URL where the frameworks can be found.
      *
@@ -66,16 +94,56 @@ public function plans($userid) {
         return new moodle_url('/admin/tool/lp/plans.php', array('userid' => $userid));
     }
 
+    /**
+     * The URL where the template can be found.
+     *
+     * @param int $templateid The template ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function template($templateid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/templatecompetencies.php', array(
+            'templateid' => $templateid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
+    /**
+     * The URL where the templates can be found.
+     *
+     * @param int $pagecontextid The ID of the context that we are browsing.
+     * @return moodle_url
+     */
+    public function templates($pagecontextid) {
+        return new moodle_url('/admin/tool/lp/learningplans.php', array('pagecontextid' => $pagecontextid));
+    }
+
     /**
      * The URL where the user competency can be found.
      *
-     * @param int $usercompetency The user competency ID
+     * @param int $usercompetencyid The user competency ID
      * @return moodle_url
      */
     public function user_competency($usercompetencyid) {
         return new moodle_url('/admin/tool/lp/user_competency.php', array('id' => $usercompetencyid));
     }
 
+    /**
+     * The URL where the user competency can be found in the context of a course.
+     *
+     * @param int $userid The user ID
+     * @param int $competencyid The competency ID.
+     * @param int $courseid The course ID.
+     * @return moodle_url
+     */
+    public function user_competency_in_course($userid, $competencyid, $courseid) {
+        return new moodle_url('/admin/tool/lp/user_competency_in_course.php', array(
+            'userid' => $userid,
+            'competencyid' => $competencyid,
+            'courseid' => $courseid
+        ));
+    }
+
     /**
      * The URL where the user competency can be found in the context of a plan.
      *
@@ -95,7 +163,7 @@ public function user_competency_in_plan($userid, $competencyid, $planid) {
     /**
      * The URL where the user evidence (of prior learning) can be found.
      *
-     * @param int $usercompetency The user evidence ID
+     * @param int $userevidenceid The user evidence ID
      * @return moodle_url
      */
     public function user_evidence($userevidenceid) {

competency/classes/url.php

@@ -72,6 +72,28 @@ protected static function get($resource, $args) {
         return call_user_func_array([static::$resolver, $resource], $args);
     }
 
+    /**
+     * The URL where the competency can be found.
+     *
+     * @param int $competencyid The competency ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function competency($competencyid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * The URL where the framework can be found.
+     *
+     * @param int $frameworkid The framework ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function framework($frameworkid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the frameworks can be found.
      *
@@ -102,16 +124,49 @@ public static function plans($userid) {
         return static::get(__FUNCTION__, func_get_args());
     }
 
+    /**
+     * The URL where the template can be found.
+     *
+     * @param int $templateid The template ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function template($templateid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * The URL where the templates can be found.
+     *
+     * @param int $pagecontextid The ID of the context that we are browsing.
+     * @return moodle_url
+     */
+    public function templates($pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the user competency can be found.
      *
-     * @param int $usercompetency The user competency ID
+     * @param int $usercompetencyid The user competency ID
      * @return moodle_url
      */
     public static function user_competency($usercompetencyid) {
         return static::get(__FUNCTION__, func_get_args());
     }
 
+    /**
+     * The URL where the user competency can be found in the context of a course.
+     *
+     * @param int $userid The user ID
+     * @param int $competencyid The competency ID.
+     * @param int $courseid The course ID.
+     * @return moodle_url
+     */
+    public static function user_competency_in_course($userid, $competencyid, $courseid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the user competency can be found in the context of a plan.
      *
@@ -127,7 +182,7 @@ public static function user_competency_in_plan($userid, $competencyid, $planid)
     /**
      * The URL where the user evidence (of prior learning) can be found.
      *
-     * @param int $usercompetency The user evidence ID
+     * @param int $userevidenceid The user evidence ID
      * @return moodle_url
      */
     public static function user_evidence($userevidenceid) {

lib/classes/event/competency_created.php

@@ -82,10 +82,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetency.php', array(
-            'id' => $this->objectid,
-            'pagecontextid' => $this->contextid
-        ));
+        return \core_competency\url::competency($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_evidence_created.php

@@ -119,10 +119,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        $urlparams = [
-            'id' => $this->other['usercompetencyid']
-        ];
-        return new \moodle_url('/admin/tool/lp/user_competency.php', $urlparams);
+        return \core_competency\url::user_competency($this->other['usercompetencyid']);
     }
 
     /**

lib/classes/event/competency_framework_created.php

@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php', array(
-            'id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_framework_updated.php

@@ -85,8 +85,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_framework_viewed.php

@@ -81,10 +81,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/competencies.php', array(
-                                                                        'competencyframeworkid' => $this->objectid,
-                                                                        'pagecontextid' => $this->contextid
-                ));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_plan_approved.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_completed.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_created.php

@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_reopened.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_review_request_cancelled.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_review_requested.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_review_started.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_review_stopped.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_unapproved.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_unlinked.php

@@ -84,8 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_updated.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_plan_viewed.php

@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**

lib/classes/event/competency_template_created.php

@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/edittemplate.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_template_updated.php

@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/edittemplate.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**

lib/classes/event/competency_template_viewed.php

@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/templatecompetencies.php',
-                               array('templateid' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**