mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-05-11 14:26:33 +01:00
commit a1c6871bb3
12 changed files with 107 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/amd/build/actions.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
course/amd/src/actions.js
View File

@ -22,8 +22,9 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @since 3.3
*/
define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str', 'core/url', 'core/yui'],
function($, ajax, templates, notification, str, url, Y) {
define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str', 'core/url', 'core/yui',
'core/modal_factory', 'core/modal_events', 'core/key_codes'],
function($, ajax, templates, notification, str, url, Y, ModalFactory, ModalEvents, KeyCodes) {
var CSS = {
EDITINPROGRESS: 'editinprogress',
SECTIONDRAGGABLE: 'sectiondraggable',
@ -36,7 +37,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
MENU: '.moodle-actionmenu[data-enhance=moodle-core-actionmenu]',
TOGGLE: '.toggle-display,.dropdown-toggle',
SECTIONLI: 'li.section',
SECTIONACTIONMENU: '.section_action_menu'
SECTIONACTIONMENU: '.section_action_menu',
ADDSECTIONS: '#changenumsections [data-add-sections]'
};
Y.use('moodle-course-coursebase', function() {
@ -576,6 +578,44 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
editSection(sectionElement, sectionId, actionItem, courseformat);
}
});
// Add a handler for "Add sections" link to ask for a number of sections to add.
str.get_string('numberweeks').done(function(strNumberSections) {
var trigger = $(SELECTOR.ADDSECTIONS),
modalTitle = trigger.attr('data-add-sections');
var modalBody = $('<div><label for="add_section_numsections"></label> ' +
'<input id="add_section_numsections" type="number" min="1" value="1"></div>');
modalBody.find('label').html(strNumberSections);
ModalFactory.create({
title: modalTitle,
type: ModalFactory.types.SAVE_CANCEL,
body: modalBody.html()
}, trigger)
.done(function(modal) {
var numSections = $(modal.getBody()).find('#add_section_numsections'),
addSections = function() {
// Check if value of the "Number of sections" is a valid positive integer and redirect
// to adding a section script.
if ('' + parseInt(numSections.val()) === numSections.val() && parseInt(numSections.val()) >= 1) {
document.location = trigger.attr('href') + '&numsections=' + parseInt(numSections.val());
}
};
modal.setSaveButtonText(modalTitle);
modal.getRoot().on(ModalEvents.shown, function() {
// When modal is shown focus and select the input and add a listener to keypress of "Enter".
numSections.focus().select().on('keydown', function(e) {
if (e.keyCode === KeyCodes.enter) {
addSections();
}
});
});
modal.getRoot().on(ModalEvents.save, function(e) {
// When modal "Add" button is pressed.
e.preventDefault();
addSections();
});
});
});
},
/**

8
course/changenumsections.php
View File

@ -31,6 +31,7 @@ require_once($CFG->dirroot.'/course/lib.php');
$courseid = required_param('courseid', PARAM_INT);
$increase = optional_param('increase', null, PARAM_BOOL);
$insertsection = optional_param('insertsection', null, PARAM_INT); // Insert section at position; 0 means at the end.
$numsections = optional_param('numsections', 1, PARAM_INT); // Number of sections to insert.
$returnurl = optional_param('returnurl', null, PARAM_LOCALURL); // Where to return to after the action.
$sectionreturn = optional_param('sectionreturn', null, PARAM_INT); // Section to return to, ignored if $returnurl is specified.
@ -70,9 +71,12 @@ if (isset($courseformatoptions['numsections']) && $increase !== null) {
// Inserting sections at any position except in the very end requires capability to move sections.
require_capability('moodle/course:movesections', context_course::instance($course->id));
}
$section = course_create_section($course, $insertsection);
$sections = [];
for ($i = 0; $i < max($numsections, 1); $i ++) {
$sections[] = course_create_section($course, $insertsection);
}
if (!$returnurl) {
$returnurl = course_get_url($course, $section->section,
$returnurl = course_get_url($course, $sections[0]->section,
($sectionreturn !== null) ? ['sr' => $sectionreturn] : []);
}
}

7
course/editsection.php
View File

@ -49,9 +49,14 @@ if ($deletesection) {
$cancelurl = course_get_url($course, $sectioninfo, array('sr' => $sectionreturn));
if (course_can_delete_section($course, $sectioninfo)) {
$confirm = optional_param('confirm', false, PARAM_BOOL) && confirm_sesskey();
if (!$confirm && optional_param('sesskey', null, PARAM_RAW) !== null &&
empty($sectioninfo->summary) && empty($sectioninfo->sequence) && confirm_sesskey()) {
// Do not ask for confirmation if section is empty and sesskey is already provided.
$confirm = true;
}
if ($confirm) {
course_delete_section($course, $sectioninfo, true, true);
$courseurl = course_get_url($course, 0, array('sr' => $sectionreturn));
$courseurl = course_get_url($course, $sectioninfo->section - 1, array('sr' => $sectionreturn));
redirect($courseurl);
} else {
if (get_string_manager()->string_exists('deletesection', 'format_' . $course->format)) {

14
course/format/renderer.php
View File

@ -394,7 +394,8 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
$url = new moodle_url('/course/editsection.php', array(
'id' => $section->id,
'sr' => $sectionreturn,
'delete' => 1));
'delete' => 1,
'sesskey' => sesskey()));
$controls['delete'] = array(
'url' => $url,
'icon' => 'i/delete',
@ -991,18 +992,19 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
// capabilities 'moodle/course:update' and 'moodle/course:movesections'.
echo html_writer::start_tag('div', array('id' => 'changenumsections', 'class' => 'mdl-right'));
if (get_string_manager()->string_exists('addsection', 'format_'.$course->format)) {
$straddsection = get_string('addsection', 'format_'.$course->format);
if (get_string_manager()->string_exists('addsections', 'format_'.$course->format)) {
$straddsections = get_string('addsections', 'format_'.$course->format);
} else {
$straddsection = get_string('addsection');
$straddsections = get_string('addsections');
}
$url = new moodle_url('/course/changenumsections.php',
['courseid' => $course->id, 'insertsection' => 0, 'sesskey' => sesskey()]);
if ($sectionreturn !== null) {
$url->param('sectionreturn', $sectionreturn);
}
$icon = $this->output->pix_icon('t/add', $straddsection);
echo html_writer::link($url, $icon . $straddsection, array('class' => 'add-section'));
$icon = $this->output->pix_icon('t/add', $straddsections);
echo html_writer::link($url, $icon . $straddsections,
array('class' => 'add-sections', 'data-add-sections' => $straddsections));
echo html_writer::end_tag('div');
}
}

2
course/format/topics/lang/en/format_topics.php
View File

@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['addsection'] = 'Add topic';
$string['addsections'] = 'Add topics';
$string['currentsection'] = 'This topic';
$string['editsection'] = 'Edit topic';
$string['editsectionname'] = 'Edit topic name';

15
course/format/topics/tests/behat/edit_delete_sections.feature
View File

@ -79,3 +79,18 @@ Feature: Sections can be edited and deleted in topics format
And I should not see "Test chat name"
And I should see "Test choice name" in the "li#section-4" "css_element"
And I should see "Topic 4"
@javascript
Scenario: Adding sections in topics format
When I follow "Add topics"
Then the field "Number of sections" matches value "1"
And I press "Add topics"
And I should see "Topic 6" in the "li#section-6" "css_element"
And "li#section-7" "css_element" should not exist
And I follow "Add topics"
And I set the field "Number of sections" to "3"
And I press "Add topics"
And I should see "Topic 7" in the "li#section-7" "css_element"
And I should see "Topic 8" in the "li#section-8" "css_element"
And I should see "Topic 9" in the "li#section-9" "css_element"
And "li#section-10" "css_element" should not exist

2
course/format/weeks/lang/en/format_weeks.php
View File

@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['addsection'] = 'Add week';
$string['addsections'] = 'Add weeks';
$string['currentsection'] = 'This week';
$string['editsection'] = 'Edit week';
$string['editsectionname'] = 'Edit week name';

15
course/format/weeks/tests/behat/edit_delete_sections.feature
View File

@ -86,3 +86,18 @@ Feature: Sections can be edited and deleted in weeks format
And I should not see "Test chat name"
And I should see "Test choice name" in the "li#section-4" "css_element"
And I should see "22 May - 28 May"
@javascript
Scenario: Adding sections in weeks format
When I follow "Add weeks"
Then the field "Number of sections" matches value "1"
And I press "Add weeks"
And I should see "5 June - 11 June" in the "li#section-6" "css_element"
And "li#section-7" "css_element" should not exist
And I follow "Add weeks"
And I set the field "Number of sections" to "3"
And I press "Add weeks"
And I should see "12 June - 18 June" in the "li#section-7" "css_element"
And I should see "19 June - 25 June" in the "li#section-8" "css_element"
And I should see "26 June - 2 July" in the "li#section-9" "css_element"
And "li#section-10" "css_element" should not exist

2
lang/en/moodle.php
View File

@ -71,7 +71,7 @@ $string['addresource'] = 'Add a resource...';
$string['addresourceoractivity'] = 'Add an activity or resource';
$string['addresourcetosection'] = 'Add a resource to section \'{$a}\'';
$string['address'] = 'Address';
$string['addsection'] = 'Add section';
$string['addsections'] = 'Add sections';
$string['addstudent'] = 'Add student';
$string['addsubcategory'] = 'Add a subcategory';
$string['addteacher'] = 'Add teacher';

2
lib/amd/build/modal_save_cancel.min.js vendored
View File

@ -1 +1 @@
define(["jquery","core/notification","core/custom_interaction_events","core/modal","core/modal_events"],function(a,b,c,d,e){var f={SAVE_BUTTON:'[data-action="save"]',CANCEL_BUTTON:'[data-action="cancel"]'},g=function(a){d.call(this,a),this.getFooter().find(f.SAVE_BUTTON).length||b.exception({message:"No save button found"}),this.getFooter().find(f.CANCEL_BUTTON).length||b.exception({message:"No cancel button found"})};return g.prototype=Object.create(d.prototype),g.prototype.constructor=g,g.prototype.setFooter=function(){b.exception({message:"Can not change the footer of a save cancel modal"})},g.prototype.registerEventListeners=function(){d.prototype.registerEventListeners.call(this),this.getModal().on(c.events.activate,f.SAVE_BUTTON,function(b,c){var d=a.Event(e.save);this.getRoot().trigger(d,this),d.isDefaultPrevented()||(this.hide(),c.originalEvent.preventDefault())}.bind(this)),this.getModal().on(c.events.activate,f.CANCEL_BUTTON,function(b,c){var d=a.Event(e.cancel);this.getRoot().trigger(d,this),d.isDefaultPrevented()||(this.hide(),c.originalEvent.preventDefault())}.bind(this))},g});
define(["jquery","core/notification","core/custom_interaction_events","core/modal","core/modal_events"],function(a,b,c,d,e){var f={SAVE_BUTTON:'[data-action="save"]',CANCEL_BUTTON:'[data-action="cancel"]'},g=function(a){d.call(this,a),this.getFooter().find(f.SAVE_BUTTON).length||b.exception({message:"No save button found"}),this.getFooter().find(f.CANCEL_BUTTON).length||b.exception({message:"No cancel button found"})};return g.prototype=Object.create(d.prototype),g.prototype.constructor=g,g.prototype.setFooter=function(){b.exception({message:"Can not change the footer of a save cancel modal"})},g.prototype.registerEventListeners=function(){d.prototype.registerEventListeners.call(this),this.getModal().on(c.events.activate,f.SAVE_BUTTON,function(b,c){var d=a.Event(e.save);this.getRoot().trigger(d,this),d.isDefaultPrevented()||(this.hide(),c.originalEvent.preventDefault())}.bind(this)),this.getModal().on(c.events.activate,f.CANCEL_BUTTON,function(b,c){var d=a.Event(e.cancel);this.getRoot().trigger(d,this),d.isDefaultPrevented()||(this.hide(),c.originalEvent.preventDefault())}.bind(this))},g.prototype.setSaveButtonText=function(a){this.getFooter().find(f.SAVE_BUTTON).text(a)},g});

9
lib/amd/src/modal_save_cancel.js
View File

@ -88,5 +88,14 @@ define(['jquery', 'core/notification', 'core/custom_interaction_events', 'core/m
}.bind(this));
};
/**
* Allows to overwrite the text of "Save changes" button.
*
* @param String text
*/
ModalSaveCancel.prototype.setSaveButtonText = function(text) {
this.getFooter().find(SELECTORS.SAVE_BUTTON).text(text);
};
return ModalSaveCancel;
});