Browse Source

Tidy up coding violations in fix for #225

MOODLE_32_STABLE
Dan Marsden 8 years ago
parent
commit
c09f058462
  1. 4
      classes/summary.php
  2. 13
      renderer.php

4
classes/summary.php

@ -289,9 +289,11 @@ class mod_attendance_summary {
{$where} {$where}
GROUP BY atl.studentid, sts.setnumber, sts.acronym"; GROUP BY atl.studentid, sts.setnumber, sts.acronym";
$this->userstakensessionsbyacronym = array(); $this->userstakensessionsbyacronym = array();
foreach ($DB->get_recordset_sql($sql, $params) AS $rec) { $records = $DB->get_recordset_sql($sql, $params);
foreach ($records as $rec) {
$this->userstakensessionsbyacronym[$rec->userid][$rec->setnumber][$rec->acronym] = $rec->numtakensessions; $this->userstakensessionsbyacronym[$rec->userid][$rec->setnumber][$rec->acronym] = $rec->numtakensessions;
} }
$records->close();
} }
/** /**

13
renderer.php

@ -900,7 +900,7 @@ class mod_attendance_renderer extends plugin_renderer_base {
} }
$setnumber = -1; $setnumber = -1;
foreach ($reportdata->statuses AS $sts) { foreach ($reportdata->statuses as $sts) {
if ($sts->setnumber != $setnumber) { if ($sts->setnumber != $setnumber) {
$colclass = empty($colclass) ? 'columncontrast' : null; $colclass = empty($colclass) ? 'columncontrast' : null;
$setnumber = $sts->setnumber; $setnumber = $sts->setnumber;
@ -978,9 +978,12 @@ class mod_attendance_renderer extends plugin_renderer_base {
$usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id); $usersummary = $reportdata->summary->get_taken_sessions_summary_for($user->id);
} }
foreach ($reportdata->statuses AS $sts) { foreach ($reportdata->statuses as $sts) {
$row->cells[] = isset($usersummary->userstakensessionsbyacronym[$sts->setnumber][$sts->acronym]) ? if (isset($usersummary->userstakensessionsbyacronym[$sts->setnumber][$sts->acronym])) {
$usersummary->userstakensessionsbyacronym[$sts->setnumber][$sts->acronym] : 0; $row->cells[] = $usersummary->userstakensessionsbyacronym[$sts->setnumber][$sts->acronym];
} else {
$row->cells[] = 0;
}
} }
$row->cells[] = $usersummary->numtakensessions; $row->cells[] = $usersummary->numtakensessions;
@ -1038,7 +1041,7 @@ class mod_attendance_renderer extends plugin_renderer_base {
$cell->style = 'white-space:nowrap;'; $cell->style = 'white-space:nowrap;';
$statrow->cells[] = $cell; $statrow->cells[] = $cell;
} }
foreach ($reportdata->statuses AS $sts) { foreach ($reportdata->statuses as $sts) {
$statrow->cells[] = ''; $statrow->cells[] = '';
} }
$statrow->cells[] = ''; $statrow->cells[] = '';

Loading…
Cancel
Save