Browse Source

Fix #72 - Exporting 'Common' Session type Sessions filtered by Group

MOODLE_28_STABLE
Barry Oosthuizen 10 years ago
parent
commit
74f7ed9b24
  1. 4
      locallib.php
  2. 2
      renderables.php

4
locallib.php

@ -697,7 +697,7 @@ class attendance {
return $DB->count_records_select('attendance_sessions', $where, $params); return $DB->count_records_select('attendance_sessions', $where, $params);
} }
public function get_filtered_sessions() { public function get_filtered_sessions($filtergroups = true) {
global $DB; global $DB;
if ($this->pageparams->startdate && $this->pageparams->enddate) { if ($this->pageparams->startdate && $this->pageparams->enddate) {
@ -707,7 +707,7 @@ class attendance {
} else { } else {
$where = "attendanceid = :aid AND sessdate >= :csdate"; $where = "attendanceid = :aid AND sessdate >= :csdate";
} }
if ($this->pageparams->get_current_sesstype() > att_page_with_filter_controls::SESSTYPE_ALL) { if ($filtergroups && $this->pageparams->get_current_sesstype() > att_page_with_filter_controls::SESSTYPE_ALL) {
$where .= " AND groupid=:cgroup"; $where .= " AND groupid=:cgroup";
} }
$params = array( $params = array(

2
renderables.php

@ -475,7 +475,7 @@ class attendance_report_data implements renderable {
$this->groups = groups_get_all_groups($att->course->id); $this->groups = groups_get_all_groups($att->course->id);
$this->sessions = $att->get_filtered_sessions(); $this->sessions = $att->get_filtered_sessions(false);
$this->statuses = $att->get_statuses(); $this->statuses = $att->get_statuses();
$this->allstatuses = $att->get_statuses(false); $this->allstatuses = $att->get_statuses(false);

Loading…
Cancel
Save