mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2016-04-26 10:49:32 +08:00
commit e9eb7ca21f
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tool/lp/classes/external/user_evidence_summary_exporter.php vendored
View File

@ -66,6 +66,9 @@ class user_evidence_summary_exporter extends \core_competency\external\persisten
'optional' => true,
'multiple' => true
),
'userhasplan' => array(
'type' => PARAM_BOOL
),
);
}
@ -124,6 +127,7 @@ class user_evidence_summary_exporter extends \core_competency\external\persisten
'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),

2
admin/tool/lp/templates/user_evidence_list_page.mustache
View File

@ -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}}

2
admin/tool/lp/templates/user_evidence_page.mustache
View File

@ -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>

9
competency/classes/user_evidence.php
View File

@ -110,6 +110,15 @@ class user_evidence extends persistent {
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.
*