MDL-75423 gradereport_singleview: Move action col to the right

This commit is contained in:
Shamim Rezaie 2022-10-19 20:39:52 +11:00 committed by Mihail Geshoski
parent bdb16eee5a
commit 6d3872d06f
5 changed files with 14 additions and 11 deletions

View File

@ -172,8 +172,8 @@ class grade extends tablelike implements selectable_items, filterable_items {
*/
public function original_headers() {
return [
'', // For filter icon.
get_string('fullnameuser', 'core'),
'', // For filter icon.
get_string('grade', 'grades'),
get_string('range', 'grades'),
get_string('feedback', 'grades'),
@ -222,9 +222,9 @@ class grade extends tablelike implements selectable_items, filterable_items {
$formatteddefinition = $this->format_definition($grade);
$line = [
html_writer::link($url, $userpic . $fullname),
$OUTPUT->action_icon($this->format_link('user', $item->id), new pix_icon('t/editstring', ''), null,
['title' => $iconstring, 'aria-label' => $iconstring]),
html_writer::link($url, $userpic . $fullname),
$formatteddefinition['finalgrade'],
$this->item_range(),
$formatteddefinition['feedback'],
@ -232,8 +232,8 @@ class grade extends tablelike implements selectable_items, filterable_items {
$formatteddefinition['exclude'],
];
$lineclasses = [
'action',
'user',
'action',
'grade',
'range',
];
@ -241,7 +241,7 @@ class grade extends tablelike implements selectable_items, filterable_items {
$i = 0;
foreach ($line as $key => $value) {
$cell = new \html_table_cell($value);
if ($isheader = $i == 1) {
if ($isheader = $i == 0) {
$cell->header = $isheader;
$cell->scope = "row";
}

View File

@ -135,8 +135,8 @@ class user extends tablelike implements selectable_items {
*/
public function original_headers(): array {
return [
'', // For filter icon.
get_string('assessmentname', 'gradereport_singleview'),
'', // For filter icon.
get_string('gradecategory', 'grades'),
get_string('grade', 'grades'),
get_string('range', 'grades'),
@ -189,9 +189,9 @@ class user extends tablelike implements selectable_items {
$formatteddefinition = $this->format_definition($grade);
$line = [
$this->format_icon($item) . $lockicon . $itemlabel,
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', ''), null,
['title' => $iconstring, 'aria-label' => $iconstring]),
$this->format_icon($item) . $lockicon . $itemlabel,
$this->category($item),
$formatteddefinition['finalgrade'],
new range($item),
@ -200,8 +200,8 @@ class user extends tablelike implements selectable_items {
$formatteddefinition['exclude'],
];
$lineclasses = [
'action',
'gradeitem',
'action',
'category',
'grade',
'range',
@ -211,7 +211,7 @@ class user extends tablelike implements selectable_items {
$i = 0;
foreach ($line as $key => $value) {
$cell = new \html_table_cell($value);
if ($isheader = $i == 1) {
if ($isheader = $i == 0) {
$cell->header = $isheader;
$cell->scope = "row";
}

View File

@ -11,7 +11,8 @@
border-top: $table-border-width solid $table-border-color;
}
thead th {
thead th,
thead td {
vertical-align: bottom;
border-bottom: (2 * $table-border-width) solid $table-border-color;
}

View File

@ -19166,7 +19166,8 @@ img.userpicture {
padding: 0.75rem;
vertical-align: top;
border-top: 1px solid #dee2e6; }
.generaltable thead th {
.generaltable thead th,
.generaltable thead td {
vertical-align: bottom;
border-bottom: 2px solid #dee2e6; }
.generaltable tbody + tbody {

View File

@ -19166,7 +19166,8 @@ img.userpicture {
padding: 0.75rem;
vertical-align: top;
border-top: 1px solid #dee2e6; }
.generaltable thead th {
.generaltable thead th,
.generaltable thead td {
vertical-align: bottom;
border-bottom: 2px solid #dee2e6; }
.generaltable tbody + tbody {