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

Merged MDL-13478 Cleaned up some variables

Browse source
This commit is contained in:
moodler 2008-03-03 05:24:55 +00:00
parent c2a4d0169b
commit 5d9d5227ad
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
mod/choice/lib.php
View file

@ -295,7 +295,7 @@ function choice_show_reportlink($user, $cm) {
echo '</div>'; echo '</div>';
} }
function choice_show_results($choice, $course, $cm, $users, $forcepublish='') { function choice_show_results($choice, $course, $cm, $allresponses, $forcepublish='') {
global $CFG, $COLUMN_HEIGHT; global $CFG, $COLUMN_HEIGHT;
print_heading(get_string("responses", "choice")); print_heading(get_string("responses", "choice"));
@ -303,12 +303,12 @@ function choice_show_results($choice, $course, $cm, $users, $forcepublish='') {
$forcepublish = $choice->publish; $forcepublish = $choice->publish;
} }
if (!$users) { if (!$allresponses) {
print_heading(get_string("nousersyet")); print_heading(get_string("nousersyet"));
} }
$totalresponsecount = 0; $totalresponsecount = 0;
foreach ($users as $optionid => $userlist) { foreach ($allresponses as $optionid => $userlist) {
if ($choice->showunanswered || $optionid) { if ($choice->showunanswered || $optionid) {
$totalresponsecount += count($userlist); $totalresponsecount += count($userlist);
} }
@ -353,7 +353,7 @@ function choice_show_results($choice, $course, $cm, $users, $forcepublish='') {
// we do not get <table></table> erro from w3c validator // we do not get <table></table> erro from w3c validator
// MDL-7861 // MDL-7861
echo "<table class=\"choiceresponse\"><tr><td></td></tr>"; echo "<table class=\"choiceresponse\"><tr><td></td></tr>";
foreach ($users[0] as $user) { foreach ($allresponses[0] as $user) {
echo "<tr>"; echo "<tr>";
echo "<td class=\"picture\">"; echo "<td class=\"picture\">";
print_user_picture($user->id, $course->id, $user->picture); print_user_picture($user->id, $course->id, $user->picture);
@ -373,8 +373,8 @@ function choice_show_results($choice, $course, $cm, $users, $forcepublish='') {
// we do not get <table></table> erro from w3c validator // we do not get <table></table> erro from w3c validator
// MDL-7861 // MDL-7861
echo '<table class="choiceresponse"><tr><td></td></tr>'; echo '<table class="choiceresponse"><tr><td></td></tr>';
if (isset($users[$optionid])) { if (isset($allresponses[$optionid])) {
foreach ($users[$optionid] as $user) { foreach ($allresponses[$optionid] as $user) {
$columncount[$optionid] += 1; $columncount[$optionid] += 1;
echo '<tr><td class="attemptcell">'; echo '<tr><td class="attemptcell">';
if ($viewresponses) { if ($viewresponses) {
@ -450,7 +450,7 @@ function choice_show_results($choice, $course, $cm, $users, $forcepublish='') {
print_string('notanswered', 'choice'); print_string('notanswered', 'choice');
echo "</th>"; echo "</th>";
$column[0] = 0; $column[0] = 0;
foreach ($users[0] as $user) { foreach ($allresponses[0] as $user) {
$column[0]++; $column[0]++;
} }
$maxcolumn = $column[0]; $maxcolumn = $column[0];
@ -463,10 +463,8 @@ function choice_show_results($choice, $course, $cm, $users, $forcepublish='') {
echo "</th>"; echo "</th>";
$column[$optionid] = 0; $column[$optionid] = 0;
if (isset($users[$optionid])) { if (isset($allresponses[$optionid])) {
foreach ($users[$optionid] as $user) { $column[$optionid] = count($allresponses[$optionid]);
$column[$optionid]++;
}
if ($column[$optionid] > $maxcolumn) { if ($column[$optionid] > $maxcolumn) {
$maxcolumn = $column[$optionid]; $maxcolumn = $column[$optionid];
} }
@ -687,29 +685,29 @@ function choice_get_response_data($choice, $cm, $groupmode) {
$currentgroup = 0; $currentgroup = 0;
} }
/// Initialise the returned array, which is a matrix: $users[responseid][userid] = responseobject /// Initialise the returned array, which is a matrix: $allresponses[responseid][userid] = responseobject
$users = array(); $allresponses = array();
/// First get all the users who have access here /// First get all the users who have access here
/// To start with we assume they are all "unanswered" then move them later /// To start with we assume they are all "unanswered" then move them later
$users[0] = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.firstname ASC', '', '', $currentgroup, '', false, true); $allresponses[0] = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.firstname ASC', '', '', $currentgroup, '', false, true);
/// Get all the recorded responses for this choice /// Get all the recorded responses for this choice
$allresponses = get_records('choice_answers', 'choiceid', $choice->id); $rawresponses = get_records('choice_answers', 'choiceid', $choice->id);
/// Use the responses to move users into the correct column /// Use the responses to move users into the correct column
if ($allresponses) { if ($rawresponses) {
foreach ($allresponses as $response) { foreach ($rawresponses as $response) {
if (isset($users[0][$response->userid])) { // This person is enrolled and in correct group if (isset($allresponses[0][$response->userid])) { // This person is enrolled and in correct group
$users[0][$response->userid]->timemodified = $response->timemodified; $allresponses[0][$response->userid]->timemodified = $response->timemodified;
$users[$response->optionid][$response->userid] = clone($users[0][$response->userid]); $allresponses[$response->optionid][$response->userid] = clone($allresponses[0][$response->userid]);
unset($users[0][$response->userid]); // Remove from unanswered column unset($allresponses[0][$response->userid]); // Remove from unanswered column
} }
} }
} }
return $users; return $allresponses;
} }
?> ?>