ILB
/
moodle-mod_attendance
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix some more coding guideline issues.

MOODLE_38_STABLE
Dan Marsden 4 years ago
parent
ba91bde77c
commit
b3d7171f73
2 changed files with 20 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      renderables.php
  2. 24
      renderer.php

3
renderables.php
View File

@ -600,7 +600,8 @@ class attendance_user_data implements renderable {
$formkey = 'user'.$stid.'sess'.$sessid; $formkey = 'user'.$stid.'sess'.$sessid;
$attid = $dbsession->attendanceid; $attid = $dbsession->attendanceid;
$statusset = array_filter($this->statuses[$attid], function($x) use($dbsession) { $statusset = array_filter($this->statuses[$attid],
function($x) use($dbsession) {
return $x->setnumber === $dbsession->statusset; return $x->setnumber === $dbsession->statusset;
}); });
$sessionatt[$sessid] = $attid; $sessionatt[$sessid] = $attid;

24
renderer.php
View File

@ -1567,10 +1567,12 @@ class mod_attendance_renderer extends plugin_renderer_base {
foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) { foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) {
if ($attstatus->setnumber === $sess->statusset) { if ($attstatus->setnumber === $sess->statusset) {
if (!array_key_exists($attstatus->acronym, $stats['date'][$weekformat]['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['date'][$weekformat]['statuses'])) {
$stats['date'][$weekformat]['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['date'][$weekformat]['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) {
$stats['overall']['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['overall']['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
} }
} }
@ -1618,10 +1620,12 @@ class mod_attendance_renderer extends plugin_renderer_base {
foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) { foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) {
if ($attstatus->setnumber === $sess->statusset) { if ($attstatus->setnumber === $sess->statusset) {
if (!array_key_exists($attstatus->acronym, $stats['course'][$sess->courseid]['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['course'][$sess->courseid]['statuses'])) {
$stats['course'][$sess->courseid]['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['course'][$sess->courseid]['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) {
$stats['overall']['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['overall']['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
} }
} }
@ -1657,10 +1661,12 @@ class mod_attendance_renderer extends plugin_renderer_base {
foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) { foreach ($userdata->statuses[$sess->attendanceid] as $attstatus) {
if ($attstatus->setnumber === $sess->statusset) { if ($attstatus->setnumber === $sess->statusset) {
if (!array_key_exists($attstatus->acronym, $stats['activity'][$sess->cmid]['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['activity'][$sess->cmid]['statuses'])) {
$stats['activity'][$sess->cmid]['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['activity'][$sess->cmid]['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) { if (!array_key_exists($attstatus->acronym, $stats['overall']['statuses'])) {
$stats['overall']['statuses'][$attstatus->acronym] = array('count' => 0, 'description' => $attstatus->description); $stats['overall']['statuses'][$attstatus->acronym] =
array('count' => 0, 'description' => $attstatus->description);
} }
} }
} }
@ -1779,7 +1785,8 @@ class mod_attendance_renderer extends plugin_renderer_base {
} }
$row->cells[] = $cell; $row->cells[] = $cell;
$courseurl = new moodle_url('/course/view.php', array('id' => $sess->courseid)); $courseurl = new moodle_url('/course/view.php', array('id' => $sess->courseid));
$cell = new html_table_cell(get_string('course', 'attendance') . ": " . html_writer::link($courseurl, $sess->cname)); $cell = new html_table_cell(get_string('course', 'attendance') . ": " .
html_writer::link($courseurl, $sess->cname));
$cell->colspan = $colcount - $summarywidth; $cell->colspan = $colcount - $summarywidth;
$cell->rowspan = 2; $cell->rowspan = 2;
$cell->attributes['class'] = 'groupheading'; $cell->attributes['class'] = 'groupheading';
@ -1821,7 +1828,8 @@ class mod_attendance_renderer extends plugin_renderer_base {
$attendanceurl = new moodle_url('/mod/attendance/view.php', array('id' => $sess->cmid, $attendanceurl = new moodle_url('/mod/attendance/view.php', array('id' => $sess->cmid,
'studentid' => $userdata->user->id, 'studentid' => $userdata->user->id,
'view' => ATT_VIEW_ALL)); 'view' => ATT_VIEW_ALL));
$cell = new html_table_cell(get_string('pluginname', 'mod_attendance') . ": " . html_writer::link($attendanceurl, $sess->attname)); $cell = new html_table_cell(get_string('pluginname', 'mod_attendance') .
": " . html_writer::link($attendanceurl, $sess->attname));
$cell->colspan = $colcount - $summarywidth; $cell->colspan = $colcount - $summarywidth;
$cell->rowspan = 2; $cell->rowspan = 2;
$cell->attributes['class'] = 'groupheading'; $cell->attributes['class'] = 'groupheading';

Write Preview
Loading…
Cancel
Save