Permalink
Browse files

Merge branch 'MDL-62814-34' of https://github.com/HuongNV13/moodle in…

…to MOODLE_34_STABLE
  • Loading branch information...
dmonllao committed Jul 10, 2018
2 parents 273e37c + 7591658 commit 32b39ec6bbd086fe4ec1d3aff3db7dc0c4b22ea0
@@ -84,7 +84,7 @@ public function display_header() {
$links = array();
foreach ($sortable as $subsort => $details) {
$links[] = $this->make_sort_link($name . '-' . $subsort,
$details['title'], '', !empty($details['reverse']));
$details['title'], isset($details['tip']) ? $details['tip'] : '', !empty($details['reverse']));
}
echo '<div class="sorters">' . implode(' / ', $links) . '</div>';
} else if ($sortable) {
@@ -0,0 +1,66 @@
<?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/>.
/**
* Helper class to to test column_base class.
*
* @package core_question
* @copyright 2018 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Helper class to to test column_base class.
*
* @package core_question
* @copyright 2018 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class testable_core_question_column extends \core_question\bank\column_base {
/** @var array sortable columns. */
private $sortable = [];
/**
* Output the column header cell.
*/
public function is_sortable() {
return $this->sortable;
}
/**
* Set the sortable columns for testing.
*
* @param array $sortable
*/
public function set_sortable(array $sortable) {
$this->sortable = $sortable;
}
protected function display_content($question, $rowclasses) {
echo 'Test Column';
}
public function get_name() {
return 'test_column';
}
protected function get_title() {
return 'Test Column';
}
}
@@ -0,0 +1,109 @@
<?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/>.
/**
* This file contains tests for the question bank column class.
*
* @package core_question
* @copyright 2018 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/editlib.php');
require_once($CFG->dirroot . '/question/tests/fixtures/testable_core_question_column.php');
/**
* Unit tests for the question bank column class.
*
* @package core_question
* @copyright 2018 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class question_bank_column_testcase extends advanced_testcase {
/**
* Test function display_header multiple sorts with no custom tooltips.
*
*/
public function test_column_header_multi_sort_no_tooltips() {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
$questionbank = new core_question\bank\view(
new question_edit_contexts(context_course::instance($course->id)),
new moodle_url('/'),
$course
);
$columnbase = new testable_core_question_column($questionbank);
$sortable = [
'apple' => [
'field' => 'apple',
'title' => 'Apple'
],
'banana' => [
'field' => 'banana',
'title' => 'Banana'
]
];
$columnbase->set_sortable($sortable);
ob_start();
$columnbase->display_header();
$output = ob_get_clean();
$this->assertContains(' title="Sort by Apple ascending">Apple</a>', $output);
$this->assertContains(' title="Sort by Banana ascending">Banana</a>', $output);
}
/**
* Test function display_header multiple sorts with custom tooltips.
*
*/
public function test_column_header_multi_sort_with_tooltips() {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
$questionbank = new core_question\bank\view(
new question_edit_contexts(context_course::instance($course->id)),
new moodle_url('/'),
$course
);
$columnbase = new testable_core_question_column($questionbank);
$sortable = [
'apple' => [
'field' => 'apple',
'title' => 'Apple',
'tip' => 'Apple Tooltips'
],
'banana' => [
'field' => 'banana',
'title' => 'Banana',
'tip' => 'Banana Tooltips'
]
];
$columnbase->set_sortable($sortable);
ob_start();
$columnbase->display_header();
$output = ob_get_clean();
$this->assertContains(' title="Sort by Apple Tooltips ascending">Apple</a>', $output);
$this->assertContains(' title="Sort by Banana Tooltips ascending">Banana</a>', $output);
}
}

0 comments on commit 32b39ec

Please sign in to comment.