mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDL-63876-master' of git://github.com/damyon/moodle
- Loading branch information
Showing
48 changed files
with
1,294 additions
and
240 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| // This file is part of Moodle - http://moodle.org/ | ||
| // | ||
| // Moodle is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Moodle is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| /** | ||
| * Badge select competency actions | ||
| * | ||
| * @module tool_lp/form_competency_element | ||
| * @package tool_lp | ||
| * @copyright 2019 Damyon Wiese <damyon@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| define(['jquery', 'tool_lp/competencypicker', 'core/ajax', 'core/notification', 'core/templates'], | ||
| function($, Picker, Ajax, Notification, Templates) { | ||
|
|
||
| var pickerInstance = null; | ||
|
|
||
| var pageContextId = 1; | ||
|
|
||
| /** | ||
| * Re-render the list of selected competencies. | ||
| * | ||
| * @method renderCompetencies | ||
| * @return {boolean} | ||
| */ | ||
| var renderCompetencies = function() { | ||
| var currentCompetencies = $('[data-action="competencies"]').val(); | ||
| var requests = []; | ||
| var i = 0; | ||
|
|
||
| if (currentCompetencies != '') { | ||
| currentCompetencies = currentCompetencies.split(','); | ||
| for (i = 0; i < currentCompetencies.length; i++) { | ||
| requests[requests.length] = { | ||
| methodname: 'core_competency_read_competency', | ||
| args: {id: currentCompetencies[i]} | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| $.when.apply($, Ajax.call(requests, false)).then(function() { | ||
| var i = 0, | ||
| competencies = []; | ||
|
|
||
| for (i = 0; i < arguments.length; i++) { | ||
| competencies[i] = arguments[i]; | ||
| } | ||
| var context = { | ||
| competencies: competencies | ||
| }; | ||
|
|
||
| return Templates.render('tool_lp/form_competency_list', context); | ||
| }).then(function(html, js) { | ||
| Templates.replaceNode($('[data-region="competencies"]'), html, js); | ||
| return true; | ||
| }).fail(Notification.exception); | ||
|
|
||
| return true; | ||
| }; | ||
|
|
||
| /** | ||
| * Deselect a competency | ||
| * | ||
| * @method unpickCompetenciesHandler | ||
| * @param {Event} e | ||
| * @return {boolean} | ||
| */ | ||
| var unpickCompetenciesHandler = function(e) { | ||
| var currentCompetencies = $('[data-action="competencies"]').val().split(','), | ||
| newCompetencies = [], | ||
| i, | ||
| toRemove = $(e.currentTarget).data('id'); | ||
|
|
||
| for (i = 0; i < currentCompetencies.length; i++) { | ||
| if (currentCompetencies[i] != toRemove) { | ||
| newCompetencies[newCompetencies.length] = currentCompetencies[i]; | ||
| } | ||
| } | ||
|
|
||
| $('[data-action="competencies"]').val(newCompetencies.join(',')); | ||
|
|
||
| return renderCompetencies(); | ||
| }; | ||
|
|
||
| /** | ||
| * Open a competencies popup to relate competencies. | ||
| * | ||
| * @method pickCompetenciesHandler | ||
| */ | ||
| var pickCompetenciesHandler = function() { | ||
| var currentCompetencies = $('[data-action="competencies"]').val().split(','); | ||
|
|
||
| if (!pickerInstance) { | ||
| pickerInstance = new Picker(pageContextId, false, 'parents', true); | ||
| pickerInstance.on('save', function(e, data) { | ||
| var before = $('[data-action="competencies"]').val(); | ||
| var compIds = data.competencyIds; | ||
| if (before != '') { | ||
| compIds = compIds.concat(before.split(',')); | ||
| } | ||
| var value = compIds.join(','); | ||
|
|
||
| $('[data-action="competencies"]').val(value); | ||
|
|
||
| return renderCompetencies(); | ||
| }); | ||
| } | ||
|
|
||
| pickerInstance.setDisallowedCompetencyIDs(currentCompetencies); | ||
| pickerInstance.display(); | ||
| }; | ||
|
|
||
| return /** @alias module:tool_lp/form_competency_element */ { | ||
| /** | ||
| * Listen for clicks on the competency picker and push the changes to the form element. | ||
| * | ||
| * @method init | ||
| * @param {Integer} contextId | ||
| */ | ||
| init: function(contextId) { | ||
| pageContextId = contextId; | ||
| renderCompetencies(); | ||
| $('[data-action="select-competencies"]').on('click', pickCompetenciesHandler); | ||
| $('body').on('click', '[data-action="deselect-competency"]', unpickCompetenciesHandler); | ||
| } | ||
| }; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <?php | ||
| // This file is part of Moodle - http://moodle.org/ | ||
| // | ||
| // Moodle is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Moodle is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
|
|
||
| /** | ||
| * Site competencies element. | ||
| * | ||
| * @package tool_lp | ||
| * @copyright 2019 Damyon Wiese | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| global $CFG; | ||
|
|
||
| require_once($CFG->libdir . '/form/hidden.php'); | ||
|
|
||
| /** | ||
| * Site competencies element. | ||
| * | ||
| * @package tool_lp | ||
| * @copyright 2019 Damyon Wiese | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class tool_lp_site_competencies_form_element extends MoodleQuickForm_hidden { | ||
|
|
||
| /** | ||
| * Constructor | ||
| * | ||
| * @param string $elementname Element name. | ||
| * @param string $value The element value. | ||
| * @param mixed $attributes Either a typical HTML attribute string or an associative array. | ||
| */ | ||
| public function __construct($elementname=null, $value='', $attributes=null) { | ||
| if ($elementname == null) { | ||
| // This is broken quickforms messing with the constructors. | ||
| return; | ||
| } | ||
| $attributes = array_merge(['data-action' => 'competencies'], $attributes ? $attributes : []); | ||
|
|
||
| parent::__construct($elementname, $value, $attributes); | ||
| $this->setType('hidden'); | ||
| } | ||
|
|
||
| /** | ||
| * Generate the hidden field and the controls to show and pick the competencies. | ||
| */ | ||
| public function toHtml() { | ||
| global $PAGE; | ||
|
|
||
| $html = parent::toHTML(); | ||
|
|
||
| if (!$this->isFrozen()) { | ||
| $context = context_system::instance(); | ||
| $params = [$context->id]; | ||
| // Require some JS to select the competencies. | ||
| $PAGE->requires->js_call_amd('tool_lp/form_competency_element', 'init', $params); | ||
| $html .= '<div class="form-group row">'; | ||
| $html .= '<div class="col-md-3"></div>'; | ||
| $html .= '<div class="col-md-9">'; | ||
| $html .= '<div data-region="competencies"></div>'; | ||
| $html .= '<div class="mt-3">'; | ||
| $html .= '<a class="btn btn-secondary" role="button" data-action="select-competencies">'; | ||
| $html .= get_string('addcompetency', 'tool_lp'); | ||
| $html .= '</a>'; | ||
| $html .= '</div>'; | ||
| $html .= '</div>'; | ||
| $html .= '</div>'; | ||
| } | ||
| return $html; | ||
| } | ||
|
|
||
| /** | ||
| * Accepts a renderer | ||
| * | ||
| * @param HTML_QuickForm_Renderer $renderer the renderer for the element. | ||
| * @param boolean $required not used. | ||
| * @param string $error not used. | ||
| * @return void | ||
| */ | ||
| public function accept(&$renderer, $required=false, $error=null) { | ||
| $renderer->renderElement($this, false, ''); | ||
| } | ||
| } |
Oops, something went wrong.