Merge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle

This commit is contained in:
David Monllao 2016-05-02 10:00:29 +08:00
commit 3166be0831
3 changed files with 23 additions and 18 deletions

View File

@ -404,6 +404,7 @@ class external extends external_api {
'canmanagecompetencyframeworks' => new external_value(PARAM_BOOL, 'User can manage competency frameworks'),
'canmanagecoursecompetencies' => new external_value(PARAM_BOOL, 'User can manage linked course competencies'),
'canconfigurecoursecompetencies' => new external_value(PARAM_BOOL, 'User can configure course competency settings'),
'cangradecompetencies' => new external_value(PARAM_BOOL, 'User can grade competencies.'),
'settings' => course_competency_settings_exporter::get_read_structure(),
'statistics' => course_competency_statistics_exporter::get_read_structure(),
'competencies' => new external_multiple_structure(new external_single_structure(array(

View File

@ -80,6 +80,7 @@ class course_competencies_page implements renderable, templatable {
$this->coursecompetencylist = api::list_course_competencies($courseid);
$this->canmanagecoursecompetencies = has_capability('moodle/competency:coursecompetencymanage', $this->context);
$this->canconfigurecoursecompetencies = has_capability('moodle/competency:coursecompetencyconfigure', $this->context);
$this->cangradecompetencies = has_capability('moodle/competency:competencygrade', $this->context);
$this->coursecompetencysettings = api::read_course_competency_settings($courseid);
$this->coursecompetencystatistics = new course_competency_statistics($courseid);
@ -183,6 +184,7 @@ class course_competencies_page implements renderable, templatable {
$data->canmanagecompetencyframeworks = $this->canmanagecompetencyframeworks;
$data->canmanagecoursecompetencies = $this->canmanagecoursecompetencies;
$data->canconfigurecoursecompetencies = $this->canconfigurecoursecompetencies;
$data->cangradecompetencies = $this->cangradecompetencies;
$exporter = new course_competency_settings_exporter($this->coursecompetencysettings);
$data->settings = $exporter->export($output);
$related = array('context' => $this->context);

View File

@ -25,24 +25,26 @@
{{/canmanagecoursecompetencies}}
</div>
</div>
<div data-region="configurecoursecompetencies">
{{#settings.pushratingstouserplans}}
<p class="alert">
{{#str}}coursecompetencyratingsarepushedtouserplans, tool_lp{{/str}}
{{/settings.pushratingstouserplans}}
{{^settings.pushratingstouserplans}}
<p class="alert alert-info">
{{#str}}coursecompetencyratingsarenotpushedtouserplans, tool_lp{{/str}}
{{/settings.pushratingstouserplans}}
{{#canconfigurecoursecompetencies}}
<a href="#"
data-action="configure-course-competency-settings"
data-courseid="{{courseid}}"
data-pushratingstouserplans="{{settings.pushratingstouserplans}}"
>{{#pix}}t/edit, core, {{#str}}edit{{/str}}{{/pix}}</a>
</p>
{{/canconfigurecoursecompetencies}}
</div>
<div data-region="configurecoursecompetencies">
{{#cangradecompetencies}}
<p class="alert {{^settings.pushratingstouserplans}}alert-info{{/settings.pushratingstouserplans}}">
{{#settings.pushratingstouserplans}}
{{#str}}coursecompetencyratingsarepushedtouserplans, tool_lp{{/str}}
{{/settings.pushratingstouserplans}}
{{^settings.pushratingstouserplans}}
{{#str}}coursecompetencyratingsarenotpushedtouserplans, tool_lp{{/str}}
{{/settings.pushratingstouserplans}}
{{#canconfigurecoursecompetencies}}
<a href="#"
data-action="configure-course-competency-settings"
data-courseid="{{courseid}}"
data-pushratingstouserplans="{{settings.pushratingstouserplans}}">
{{#pix}}t/edit, core, {{#str}}edit{{/str}}{{/pix}}
</a>
{{/canconfigurecoursecompetencies}}
</p>
{{/cangradecompetencies}}
</div>
{{#statistics}}
{{> tool_lp/course_competency_statistics }}
{{/statistics}}