--- multichoice.module 2007-12-05 20:22:36.000000000 -0500
+++ multichoice.module 2007-12-05 20:22:54.000000000 -0500
@@ -131,6 +131,7 @@
);
$form['body_filter']['format'] = filter_form($node->format);
+
if (user_access('allow multiple correct answers')) {
$form['multiple_answers'] = array(
'#type' => 'checkbox',
@@ -190,7 +191,7 @@
if (user_access('allow multiple correct answers')) {
$form['answers'][$i]['correct'] = array(
'#type' => 'checkbox',
- '#default_value' => $answers[$i]['is_correct'],
+ '#default_value' => $answers[$i]['points'],
);
}
}
@@ -261,7 +262,7 @@
function _multichoice_find_correct($answers) {
if (is_array($answers)) {
foreach ($answers as $id => $answer) {
- if ($answer['is_correct']) {
+ if ($answer['points']) {
return $id;
}
}
@@ -394,7 +395,7 @@
foreach ($node->answers as $value) {
if (trim($value['answer']) != "") {
db_query("INSERT INTO {quiz_multichoice_answers} " .
- "(answer_id, nid, vid, answer, feedback, is_correct, result_opti on) VALUES (%d, %d, %d, '%s', '%s', %d, %d)",
+ "(answer_id, nid, vid, answer, feedback, points, result_option) VALUES (%d, %d, %d, '%s', '%s', %d, %d)",
db_next_id('{quiz_multichoice_answers}_answer_id'), $node->nid, $question_vid, $value['answer'], $value['feedback'], $value['correct'], $value[' result_option']);
}
}
@@ -424,13 +425,13 @@
}
else {
//Update this entry
- db_query("UPDATE {quiz_multichoice_answers} SET answer = '%s', feedback = '%s', is_correct = %d, result_option = %d WHERE answer_id = %d",
+ db_query("UPDATE {quiz_multichoice_answers} SET answer = '%s', feedback = '%s', points = %d, result_option = %d WHERE answer_id = %d",
$value['answer'], $value['feedback'], $value['correct'], $value['resu lt_option'], $value['answer_id']);
}
}
else if (trim($value['answer']) != "") {
//If there is an answer, insert a new row
- db_query("INSERT INTO {quiz_multichoice_answers} (answer_id, nid, vid, an swer, feedback, is_correct, result_option) " .
+ db_query("INSERT INTO {quiz_multichoice_answers} (answer_id, nid, vid, an swer, feedback, points, result_option) " .
"VALUES(%d, %d, %d, '%s', '%s', %d, %d)",
db_next_id('{quiz_multichoice_answers}_answer_id'), $node->nid, $question_vid, $value['answer'], $value['feedback'], $value['correct'], $value[' result_option']);
}
@@ -487,11 +488,9 @@
$answers[] = $line;
}
-
$additions->answers = $answers;
// just check for multiple answers for now
-
- $additions->multiple_answers = $additions->properties['number_of_answers'] > 1 ? 1 : 0;
+ $additions->multiple_answers = $additions->properties['number_of_questions'] > 1 ? 1 : 0;
return $additions;
}
@@ -499,23 +498,23 @@
* Implementation of hook_view().
*/
function multichoice_view(&$node, $teaser = FALSE, $page = FALSE) {
- if (user_access('create multichoice')) {
- if (!$teaser) {
- $mynode = node_prepare($node, $teaser);
- $mynode->content['body'] = array('#value' => multichoice_render_question($ node));
- return $mynode;
- //$node->body = multichoice_render_question($node);
- }
- else {
- $mynode = node_prepare($node, $teaser);
- return $mynode;
- //$node->teaser = t('This is a quiz question, not to be viewedindependentl y.');
- //$node->body = $node->teaser; // we do not need Read more...
- }
- }
- else {
- drupal_access_denied();
- }
+ if (user_access('create multichoice')) {
+ if (!$teaser) {
+ $mynode = node_prepare($node, $teaser);
+ $mynode->content['body'] = array('#value' => multichoice_render_question( $node));
+ return $mynode;
+ //$node->body = multichoice_render_question($node);
+ }
+ }
+ else if ($teaser) {
+ $mynode = node_prepare($node, $teaser);
+ return $mynode;
+ //$node->teaser = t('This is a quiz question, not to be viewed independentl y.');
+ //$node->body = $node->teaser; // we do not need Read more...
+ }
+ else {
+ drupal_access_denied();
+ }
}
/**
@@ -619,7 +618,7 @@
*/
function multichoice_calculate_result($nid, $vid, $tried) {
$answers = db_query("SELECT answer_id FROM {quiz_multichoice_answers} " .
- "WHERE nid = %d AND vid = %d AND is_correct = 1", $nid, $ vid);
+ "WHERE nid = %d AND vid = %d AND points = 1", $nid, $vid) ;
while ($answer = db_fetch_array($answers)) {
$correct_answers[] = $answer['answer_id'];
@@ -638,7 +637,7 @@
$cols = array();
$cols[] = $answer['answer'];
- if ($showpoints) $cols[] = (($answer['is_correct'] == 0) ? theme_multichoic e_unselected() : theme_multichoice_selected());
+ if ($showpoints) $cols[] = (($answer['points'] == 0) ? theme_multichoice_un selected() : theme_multichoice_selected());
$selected = (array_search($answer['answer_id'], $tried) !== FALSE);
$cols[] = ($selected ? theme_multichoice_selected() : theme_multichoice_uns elected());
if ($showfeedback) $cols[] = ($selected ? ''. $answer['feedback'] .'
' : '');
@@ -646,7 +645,7 @@
$rows[] = $cols;
- if ($answer['is_correct'] > 0) {
+ if ($answer['points'] > 0) {
$correctanswers[] = $answer['answer_id'];
}
}
@@ -811,7 +810,7 @@
$cols[] = $answer['answer'];
if ($showpoints) {
- $cols[] = $answer['is_correct'] ? theme_multichoice_selected() : theme_mu ltichoice_unselected();
+ $cols[] = $answer['points'] ? theme_multichoice_selected() : theme_multic hoice_unselected();
}
$cols[] = $answer['user_answer'] ? theme_multichoice_selected() : theme_mul tichoice_unselected();
$cols[] = ($showfeedback && $answer['user_answer']) ? ''. $answer['feedback'] .'
' : '';
@@ -831,7 +830,7 @@
$answers[] = $answer['answer'];
$feedbacks[] = $answer['feedback'];
}
- if ($answer['is_correct']) {
+ if ($answer['points']) {
$corrects[] = $answer['answer'];
}
}
--- quiz.module 2007-12-05 19:29:20.000000000 -0500
+++ quiz.module 2007-12-05 19:10:28.000000000 -0500
@@ -138,15 +138,13 @@
);
// Menu item for quiz taking interface
- if (user_access('administer quizzes')) {
- $items[] = array(
- 'path' => 'node/'. arg(1) .'/quiz/admin',
- 'title' => t('Quiz Admin', array('@quiz' => $quiz_name)),
- 'callback' => 'theme_quiz_view',
- 'callback arguments' => array(node_load(arg(1))),
- 'access' => user_access('administer quizzes'),
- 'type' => MENU_LOCAL_TASK,
- );
+ $items[] = array(
+ 'path' => 'node/'. arg(1) .'/quiz/start',
+ 'title' => t('Take @quiz', array('@quiz' => QUIZ_NAME)),
+ 'callback' => 'quiz_take_quiz',
+ 'access' => _quiz_status_access($node),
+ 'type' => MENU_LOCAL_TASK,
+ );
}
}
else {
@@ -1014,7 +1012,7 @@
function quiz_get_corrects($answers) {
if (is_array($answers)) {
foreach ($answers as $answer) {
- if ($answer['points'] > 0) {
+ if ($answer['is_correct'] > 0) {
$corrects[] = $answer;
}
}