ILB
/
moodle-block_completion_progress
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

CONTRIB-7181 block_completion_progress: Remove conflicting messaging and notes controls

master
Michael de Raadt 8 years ago
parent
08a82cbbf4
commit
7af816af68
2 changed files with 7 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      overview.php
  2. 4
      version.php

46
overview.php
View File

@ -19,7 +19,7 @@
* Completion Progress block overview page
*
* @package block_completion_progress
* @copyright 2016 Michael de Raadt
* @copyright 2018 Michael de Raadt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -205,10 +205,9 @@ echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'return
// Setup submissions table.
$table = new flexible_table('mod-block-completion-progress-overview');
$table->pagesize($perpage, $numberofusers);
$tablecolumns = array('select', 'picture', 'fullname', 'lastonline', 'progressbar', 'progress');
/tablecolumns = array('picture', 'fullname', 'lastonline', 'progressbar', 'progress');
$table->define_columns($tablecolumns);
$tableheaders = array(
'',
'',
get_string('fullname'),
get_string('lastonline', 'block_completion_progress'),
@ -221,9 +220,6 @@ $table->set_attribute('class', 'overviewTable');
$table->column_style_all('padding', '5px');
$table->column_style_all('text-align', 'left');
$table->column_style_all('vertical-align', 'middle');
$table->column_style('select', 'text-align', 'right');
$table->column_style('select', 'padding', '5px 0 5px 5px');
$table->column_style('select', 'width', '5%');
$table->column_style('picture', 'width', '5%');
$table->column_style('fullname', 'width', '15%');
$table->column_style('lastonline', 'width', '15%');
@ -233,7 +229,7 @@ $table->column_style('progressbar', 'padding', '0');
$table->column_style('progress', 'text-align', 'center');
$table->column_style('progress', 'width', '8%');
$table->no_sorting('select');
// $table->no_sorting('select');
$select = '';
$table->no_sorting('picture');
$table->no_sorting('progressbar');
@ -260,10 +256,6 @@ if ($sortbyprogress) {
// Build array of user information.
$rows = array();
for ($i = $startuser; $i < $enduser; $i++) {
if ($CFG->enablenotes || $CFG->messaging) {
$selectattributes = array('type' => 'checkbox', 'class' => 'usercheckbox', 'name' => 'user'.$users[$i]->id);
$select = html_writer::empty_tag('input', $selectattributes);
}
$picture = $OUTPUT->user_picture($users[$i], array('course' => $course->id));
$namelink = html_writer::link($CFG->wwwroot.'/user/view.php?id='.$users[$i]->id.'&course='.$course->id, fullname($users[$i]));
if (empty($users[$i]->lastonlinetime)) {
@ -287,7 +279,6 @@ for ($i = $startuser; $i < $enduser; $i++) {
$rows[$i] = array(
'firstname' => strtoupper($users[$i]->firstname),
'lastname' => strtoupper($users[$i]->lastname),
'select' => $select,
'picture' => $picture,
'fullname' => $namelink,
'lastonlinetime' => $users[$i]->lastonlinetime,
@ -306,7 +297,8 @@ if ($sortbyprogress) {
// Build the table content and output.
if ($numberofusers > 0) {
for ($i = $startdisplay; $i < $enddisplay; $i++) {
$table->add_data(array($rows[$i]['select'], $rows[$i]['picture'],
// $table->add_data(array($rows[$i]['select'], $rows[$i]['picture'],
$table->add_data(array($rows[$i]['picture'],
$rows[$i]['fullname'], $rows[$i]['lastonline'],
$rows[$i]['progressbar'], $rows[$i]['progress']));
}
@ -323,34 +315,6 @@ if ($paged) {
echo $OUTPUT->container(html_writer::link($perpageurl, get_string('showperpage', '', DEFAULT_PAGE_SIZE)), array(), 'showall');
}
// Output messaging controls.
if ($CFG->enablenotes || $CFG->messaging) {
echo html_writer::start_tag('div', array('class' => 'buttons'));
echo html_writer::empty_tag('input', array('type' => 'button', 'id' => 'checkall', 'value' => get_string('selectall')));
echo html_writer::empty_tag('input', array('type' => 'button', 'id' => 'checknone', 'value' => get_string('deselectall')));
$displaylist = array();
if (!empty($CFG->messaging) && has_capability('moodle/course:bulkmessaging', $context)) {
$displaylist['messageselect.php'] = get_string('messageselectadd');
}
if (!empty($CFG->enablenotes) && has_capability('moodle/notes:manage', $context)) {
$displaylist['addnote.php'] = get_string('addnewnote', 'notes');
$displaylist['groupaddnote.php'] = get_string('groupaddnewnote', 'notes');
}
echo html_writer::tag('label', get_string("withselectedusers"), array('for' => 'formactionid'));
echo html_writer::select($displaylist, 'formaction', '', array('' => 'choosedots'), array('id' => 'formactionid'));
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'id', 'value' => $course->id));
echo html_writer::start_tag('noscript', array('style' => 'display:inline;'));
echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('ok')));
echo html_writer::end_tag('noscript');
echo $OUTPUT->help_icon('withselectedusers');
echo html_writer::end_tag('div');
echo html_writer::end_tag('form');
}
// Organise access to JS for messaging.
$module = array('name' => 'core_user', 'fullpath' => '/user/module.js');
$PAGE->requires->js_init_call('M.core_user.init_participation', null, false, $module);
// Organise access to JS for progress bars.
$jsmodule = array('name' => 'block_completion_progress', 'fullpath' => '/blocks/completion_progress/module.js');
$arguments = array(array($block->id), $userids);

4
version.php
View File

@ -19,13 +19,13 @@
* Completion Progress block version details
*
* @package block_completion_progress
* @copyright 2016 Michael de Raadt
* @copyright 2018 Michael de Raadt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die;
$plugin->version = 2017090500;
$plugin->version = 2018021000;
$plugin->requires = 2014111100; // Moodle 2.8.
$plugin->maturity = MATURITY_STABLE;
$plugin->release = 'Version for Moodle 2.8 onwards';

Write Preview
Loading…
Cancel
Save