L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-68286 table: Support initials bar for dynamic tables

Browse Source
This commit is contained in:
Andrew Nicols
2020-04-03 16:54:13 +08:00
parent 1c112ac5fd
commit c540a575db
13 changed files with 253 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tablelib.php
+52 -10
View File
@@ -95,6 +95,12 @@ class flexible_table {
*/
protected $sortorder;
/** @var string The manually set first name initial preference */
protected $ifirst;
/** @var string The manually set last name initial preference */
protected $ilast;
var $use_pages = false;
var $use_initials = false;
@@ -525,16 +531,7 @@ class flexible_table {
}
$this->set_sorting_preferences();
$ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW);
if (!is_null($ilast) && ($ilast ==='' || strpos(get_string('alphabet', 'langconfig'), $ilast) !== false)) {
$this->prefs['i_last'] = $ilast;
}
$ifirst = optional_param($this->request[TABLE_VAR_IFIRST], null, PARAM_RAW);
if (!is_null($ifirst) && ($ifirst === '' || strpos(get_string('alphabet', 'langconfig'), $ifirst) !== false)) {
$this->prefs['i_first'] = $ifirst;
}
$this->set_initials_preferences();
// Save user preferences if they have changed.
if ($this->prefs != $oldprefs) {
@@ -1355,6 +1352,31 @@ class flexible_table {
}
}
/**
* Fill in the preferences for the initials bar.
*/
protected function set_initials_preferences(): void {
$ifirst = $this->ifirst;
$ilast = $this->ilast;
if ($ifirst === null) {
$ifirst = optional_param($this->request[TABLE_VAR_IFIRST], null, PARAM_RAW);
}
if ($ilast === null) {
$ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW);
}
if (!is_null($ifirst) && ($ifirst === '' || strpos(get_string('alphabet', 'langconfig'), $ifirst) !== false)) {
$this->prefs['i_first'] = $ifirst;
}
if (!is_null($ilast) && ($ilast === '' || strpos(get_string('alphabet', 'langconfig'), $ilast) !== false)) {
$this->prefs['i_last'] = $ilast;
}
}
/**
* Set the preferred table sorting attributes.
*
@@ -1366,6 +1388,24 @@ class flexible_table {
$this->sortorder = $sortorder;
}
/**
* Set the preferred first name initial in an initials bar.
*
* @param string $initial The character to set
*/
public function set_first_initial(string $initial): void {
$this->ifirst = $initial;
}
/**
* Set the preferred last name initial in an initials bar.
*
* @param string $initial The character to set
*/
public function set_last_initial(string $initial): void {
$this->ilast = $initial;
}
/**
* Generate the HTML for the sort icon. This is a helper method used by {@link sort_link()}.
* @param bool $isprimary whether an icon is needed (it is only needed for the primary sort column.)
@@ -1463,6 +1503,8 @@ class flexible_table {
'data-table-filters' => json_encode($this->get_filterset()),
'data-table-sort-by' => $sortdata['sortby'],
'data-table-sort-order' => $sortdata['sortorder'],
'data-table-first-initial' => $this->prefs['i_first'],
'data-table-last-initial' => $this->prefs['i_last'],
]);
}