Merge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle

BenKelada · Apr 26, 2016 · e9eb7ca · e9eb7ca
2 parents e1f9593 + 18daa64
commit e9eb7ca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/admin/tool/lp/classes/external/user_evidence_summary_exporter.php b/admin/tool/lp/classes/external/user_evidence_summary_exporter.php
@@ -66,6 +66,9 @@ protected static function define_other_properties() {
                 'optional' => true,
                 'multiple' => true
             ),
+            'userhasplan' => array(
+                'type' => PARAM_BOOL
+            ),
         );
     }
 
@@ -124,6 +127,7 @@ protected function get_other_values(renderer_base $output) {
             'canmanage' => $this->persistent->can_manage(),
             'filecount' => count($files),
             'files' => $files,
+            'userhasplan' => $this->persistent->user_has_plan(),
             'hasurlorfiles' => !empty($files) || !empty($url),
             'urlshort' => $urlshort,
             'competencycount' => count($userevidencecompetencies),

diff --git a/admin/tool/lp/templates/user_evidence_list_page.mustache b/admin/tool/lp/templates/user_evidence_list_page.mustache
@@ -95,11 +95,13 @@
                                 {{#pix}}t/edit{{/pix}} {{#str}}editthisuserevidence, tool_lp{{/str}}
                             </a>
                         </li>
+                        {{#userhasplan}}
                         <li>
                             <a href="#" data-action="link-competency">
                                 {{#pix}}t/add{{/pix}} {{#str}}linkcompetencies, tool_lp{{/str}}
                             </a>
                         </li>
+                        {{/userhasplan}}
                         <li>
                             <a data-action="send-competencies-review" href="#">
                                 {{#pix}}t/edit{{/pix}} {{#str}}sendcompetenciestoreview, tool_lp{{/str}}

diff --git a/admin/tool/lp/templates/user_evidence_page.mustache b/admin/tool/lp/templates/user_evidence_page.mustache
@@ -89,7 +89,9 @@
         <div data-region="actions">
             <div class="pull-right">
                 {{#canmanage}}
+                    {{#userhasplan}}
                     <button class="btn" data-action="link-competency">{{#pix}}t/add{{/pix}} {{#str}}linkcompetencies, tool_lp{{/str}}</button>
+                    {{/userhasplan}}
                 {{/canmanage}}
             </div>
         </div>

diff --git a/competency/classes/user_evidence.php b/competency/classes/user_evidence.php
@@ -110,6 +110,15 @@ public function get_user_competencies() {
         return user_evidence_competency::get_user_competencies_by_userevidenceid($this->get_id());
     }
 
+    /**
+     * Return true if the user of the evidence has plan.
+     *
+     * @return bool
+     */
+    public function user_has_plan() {
+        return plan::record_exists_select('userid = ?', array($this->get_userid()));
+    }
+
     /**
      * Return the files associated with this evidence.
      *