Skip to content

Commit

Permalink
Merge branch 'MDL-79056-401' of https://github.com/junpataleta/moodle …
Browse files Browse the repository at this point in the history 
…into MOODLE_401_STABLE
  • Loading branch information
@snake @andrewnicols
snake authored and andrewnicols committed Oct 3, 2023
2 parents d78dda7 + adc138d commit 925c36f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 25 deletions.
29 changes: 18 additions & 11 deletions grade/report/user/classes/report/user.php
View file
Expand Up @@ -450,7 +450,7 @@ private function fill_table_recursive(array &$element) {
$depth = $element['depth'];
$gradeobject = $element['object'];
$eid = $gradeobject->id;
$element['userid'] = $this->user->id;
$element['userid'] = $userid = $this->user->id;
$fullname = $this->gtree->get_element_header($element, true, false, true, true, true);
$data = [];
$gradeitemdata = [];
Expand Down Expand Up @@ -592,7 +592,7 @@ private function fill_table_recursive(array &$element) {
if ($this->showweight) {
$data['weight']['class'] = $class;
$data['weight']['content'] = '-';
$data['weight']['headers'] = "$headercat $headerrow weight";
$data['weight']['headers'] = "$headercat $headerrow weight$userid";
// Has a weight assigned, might be extra credit.

// This obliterates the weight because it provides a more informative description.
Expand Down Expand Up @@ -679,7 +679,7 @@ private function fill_table_recursive(array &$element) {
$gradegrade->grade_item, true);
$gradeitemdata['graderaw'] = $gradeval;
}
$data['grade']['headers'] = "$headercat $headerrow grade";
$data['grade']['headers'] = "$headercat $headerrow grade$userid";
$gradeitemdata['gradeformatted'] = $data['grade']['content'];
}

Expand All @@ -690,7 +690,7 @@ private function fill_table_recursive(array &$element) {
GRADE_DISPLAY_TYPE_REAL,
$this->rangedecimals
);
$data['range']['headers'] = "$headercat $headerrow range";
$data['range']['headers'] = "$headercat $headerrow range$userid";

$gradeitemdata['rangeformatted'] = $data['range']['content'];
$gradeitemdata['grademin'] = $gradegrade->grade_item->grademin;
Expand Down Expand Up @@ -722,7 +722,7 @@ private function fill_table_recursive(array &$element) {
GRADE_DISPLAY_TYPE_PERCENTAGE
);
}
$data['percentage']['headers'] = "$headercat $headerrow percentage";
$data['percentage']['headers'] = "$headercat $headerrow percentage$userid";
$gradeitemdata['percentageformatted'] = $data['percentage']['content'];
}

Expand Down Expand Up @@ -752,7 +752,7 @@ private function fill_table_recursive(array &$element) {
GRADE_DISPLAY_TYPE_LETTER
);
}
$data['lettergrade']['headers'] = "$headercat $headerrow lettergrade";
$data['lettergrade']['headers'] = "$headercat $headerrow lettergrade$userid";
$gradeitemdata['lettergradeformatted'] = $data['lettergrade']['content'];
}

Expand Down Expand Up @@ -786,7 +786,7 @@ private function fill_table_recursive(array &$element) {
$gradeitemdata['rank'] = $rank;
$gradeitemdata['numusers'] = $numusers;
}
$data['rank']['headers'] = "$headercat $headerrow rank";
$data['rank']['headers'] = "$headercat $headerrow rank$userid";
}

// Average.
Expand All @@ -800,7 +800,7 @@ private function fill_table_recursive(array &$element) {
} else {
$data['average']['content'] = '-';
}
$data['average']['headers'] = "$headercat $headerrow average";
$data['average']['headers'] = "$headercat $headerrow average$userid";
}

// Feedback.
Expand Down Expand Up @@ -834,13 +834,13 @@ private function fill_table_recursive(array &$element) {
['context' => $gradegrade->get_context()]);
$gradeitemdata['feedback'] = $gradegrade->feedback;
}
$data['feedback']['headers'] = "$headercat $headerrow feedback";
$data['feedback']['headers'] = "$headercat $headerrow feedback$userid";
}
// Contribution to the course total column.
if ($this->showcontributiontocoursetotal) {
$data['contributiontocoursetotal']['class'] = $class;
$data['contributiontocoursetotal']['content'] = '-';
$data['contributiontocoursetotal']['headers'] = "$headercat $headerrow contributiontocoursetotal";
$data['contributiontocoursetotal']['headers'] = "$headercat $headerrow contributiontocoursetotal$userid";

}
$this->gradeitemsdata[] = $gradeitemdata;
Expand Down Expand Up @@ -1022,9 +1022,10 @@ public function print_table(bool $return = false) {
];

// Set the table headings.
$userid = $this->user->id;
foreach ($this->tableheaders as $index => $heading) {
$headingcell = new \html_table_cell($heading);
$headingcell->attributes['id'] = $this->tablecolumns[$index];
$headingcell->attributes['id'] = $this->tablecolumns[$index] . $userid;
$headingcell->attributes['class'] = "header column-{$this->tablecolumns[$index]}";
if ($index == 0) {
$headingcell->colspan = $this->maxdepth;
Expand All @@ -1050,6 +1051,12 @@ public function print_table(bool $return = false) {
if (!is_null($content)) {
$rowcell = new \html_table_cell($content);

// Grade item names and cateogry names are referenced in the `headers` attribute of table cells.
// These table cells should be set to <th> tags.
if ($tablecolumn === 'itemname') {
$rowcell->header = true;
}

if (isset($rowdata[$tablecolumn]['class'])) {
$rowcell->attributes['class'] = $rowdata[$tablecolumn]['class'];
}
Expand Down
37 changes: 23 additions & 14 deletions grade/report/user/styles.css
View file
Expand Up @@ -67,6 +67,8 @@
.grade-report-user .user-grade .baggt,
.grade-report-user .user-grade .baggb {
font-weight: bold;
background-color: #f8f9fa;
border: none;
}

.path-grade-report-user .user-report-container,
Expand Down Expand Up @@ -99,32 +101,39 @@
border-bottom: 1px solid #dee2e6;
}

.path-grade-report-user .user-grade td.category,
.grade-report-user .user-grade td.category {
.path-grade-report-user .user-grade th.column-itemname:not(.header,.category,.baggt,.baggb),
.grade-report-user .user-grade th.column-itemname:not(.header,.category,.baggt,.baggb) {
background-color: white;
font-weight: normal;
border-bottom: 1px solid #dee2e6;
}

.path-grade-report-user .user-grade th.category,
.grade-report-user .user-grade th.category {
background-color: white;
border: 1px solid #dee2e6;
padding-left: 10px;
font-weight: bold;
}

.path-grade-report-user .user-grade td.category a[aria-expanded="true"] .expanded,
.path-grade-report-user .user-grade td.category a[aria-expanded="false"] .collapsed,
.grade-report-user .user-grade td.category a[aria-expanded="true"] .expanded,
.grade-report-user .user-grade td.category a[aria-expanded="false"] .collapsed {
.path-grade-report-user .user-grade th.category a[aria-expanded="true"] .expanded,
.path-grade-report-user .user-grade th.category a[aria-expanded="false"] .collapsed,
.grade-report-user .user-grade th.category a[aria-expanded="true"] .expanded,
.grade-report-user .user-grade th.category a[aria-expanded="false"] .collapsed {
display: none;
}

.path-grade-report-user .user-grade td.category a.toggle-category,
.grade-report-user .user-grade td.category a.toggle-category {
.path-grade-report-user .user-grade th.category a.toggle-category,
.grade-report-user .user-grade th.category a.toggle-category {
height: 24px;
width: 24px;
font-size: 12px;
line-height: 24px;
margin-right: 3px;
}

.path-grade-report-user .user-grade td.category a.toggle-category i,
.grade-report-user .user-grade td.category a.toggle-category i {
.path-grade-report-user .user-grade th.category a.toggle-category i,
.grade-report-user .user-grade th.category a.toggle-category i {
font-size: 12px;
width: 12px;
height: 12px;
Expand Down Expand Up @@ -173,14 +182,14 @@
}

@media print {
.path-grade-report-user .user-grade td.category,
.grade-report-user .user-grade td.category {
.path-grade-report-user .user-grade th.category,
.grade-report-user .user-grade th.category {
border-left: none;
border-right: none;
}

.path-grade-report-user .user-grade td.category a.toggle-category,
.grade-report-user .user-grade td.category a.toggle-category
.path-grade-report-user .user-grade th.category a.toggle-category,
.grade-report-user .user-grade th.category a.toggle-category
.path-grade-report-user #page-footer {
display: none;
}
Expand Down

0 comments on commit 925c36f

Please sign in to comment.