moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-44542-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2014-03-18 17:04:57 +13:00
commit f3516ad3b8
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mod/feedback/lib.php
View file

@ -2409,36 +2409,43 @@ function feedback_get_group_values($item,
//if the groupid is given? //if the groupid is given?
if (intval($groupid) > 0) { if (intval($groupid) > 0) {
$params = array();
if ($ignore_empty) { if ($ignore_empty) {
$ignore_empty_select = "AND fbv.value != '' AND fbv.value != '0'"; $value = $DB->sql_compare_text('fbv.value');
$ignore_empty_select = "AND $value != :emptyvalue AND $value != :zerovalue";
$params += array('emptyvalue' => '', 'zerovalue' => '0');
} else { } else {
$ignore_empty_select = ""; $ignore_empty_select = "";
} }
$query = 'SELECT fbv . * $query = 'SELECT fbv . *
FROM {feedback_value} fbv, {feedback_completed} fbc, {groups_members} gm FROM {feedback_value} fbv, {feedback_completed} fbc, {groups_members} gm
WHERE fbv.item = ? WHERE fbv.item = :itemid
AND fbv.completed = fbc.id AND fbv.completed = fbc.id
AND fbc.userid = gm.userid AND fbc.userid = gm.userid
'.$ignore_empty_select.' '.$ignore_empty_select.'
AND gm.groupid = ? AND gm.groupid = :groupid
ORDER BY fbc.timemodified'; ORDER BY fbc.timemodified';
$values = $DB->get_records_sql($query, array($item->id, $groupid)); $params += array('itemid' => $item->id, 'groupid' => $groupid);
$values = $DB->get_records_sql($query, $params);
} else { } else {
$params = array();
if ($ignore_empty) { if ($ignore_empty) {
$ignore_empty_select = "AND value != '' AND value != '0'"; $value = $DB->sql_compare_text('value');
$ignore_empty_select = "AND $value != :emptyvalue AND $value != :zerovalue";
$params += array('emptyvalue' => '', 'zerovalue' => '0');
} else { } else {
$ignore_empty_select = ""; $ignore_empty_select = "";
} }
if ($courseid) { if ($courseid) {
$select = "item = ? AND course_id = ? ".$ignore_empty_select; $select = "item = :itemid AND course_id = :courseid ".$ignore_empty_select;
$params = array($item->id, $courseid); $params += array('itemid' => $item->id, 'courseid' => $courseid);
$values = $DB->get_records_select('feedback_value', $select, $params); $values = $DB->get_records_select('feedback_value', $select, $params);
} else { } else {
$select = "item = ? ".$ignore_empty_select; $select = "item = :itemid ".$ignore_empty_select;
$params = array($item->id); $params += array('itemid' => $item->id);
$values = $DB->get_records_select('feedback_value', $select, $params); $values = $DB->get_records_select('feedback_value', $select, $params);
} }
} }