? question-node-form-ordering.patch ? quiz-484846-html-title.patch ? quiz-551124-allow-skipping-turn-on-off.patch ? remove-quiz_get_questions_type-1.patch ? remove-quiz_get_questions_type.patch ? question_types/jumping_words Index: question_types/long_answer/long_answer.classes.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/long_answer/long_answer.classes.inc,v retrieving revision 1.2.2.13 diff -u -p -r1.2.2.13 long_answer.classes.inc --- question_types/long_answer/long_answer.classes.inc 25 Aug 2009 12:22:05 -0000 1.2.2.13 +++ question_types/long_answer/long_answer.classes.inc 25 Aug 2009 20:35:38 -0000 @@ -79,6 +79,7 @@ class LongAnswerQuestion extends Abstrac '#size' => 3, '#maxlength' => 3, '#required' => TRUE, + '#weight' => 3, ); return $form; } Index: question_types/matching/matching.classes.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/matching/matching.classes.inc,v retrieving revision 1.2.2.24 diff -u -p -r1.2.2.24 matching.classes.inc --- question_types/matching/matching.classes.inc 25 Aug 2009 12:03:55 -0000 1.2.2.24 +++ question_types/matching/matching.classes.inc 25 Aug 2009 20:35:38 -0000 @@ -18,7 +18,9 @@ class MatchingQuestion extends AbstractQ public function __construct($node) { parent::__construct($node); - if (empty($this->node->match)) $this->node->match = array(); + if (empty($this->node->match)) { + $this->node->match = array(); + } } public function save($is_new = FALSE) { @@ -163,8 +165,9 @@ class MatchingQuestion extends AbstractQ public function getCreationForm($edit) { $form['match'] = array( '#type' => 'fieldset', - '#title' => t('Match Question'), + '#title' => t('Match Questions'), '#tree' => TRUE, + '#weight' => 2, ); for ($i = 1; $i <= variable_get('quiz_matching_form_size', 5); ++$i) { $form['match'][$i] = array( Index: question_types/multichoice/multichoice.classes.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/multichoice/Attic/multichoice.classes.inc,v retrieving revision 1.1.2.22 diff -u -p -r1.1.2.22 multichoice.classes.inc --- question_types/multichoice/multichoice.classes.inc 25 Aug 2009 13:43:48 -0000 1.1.2.22 +++ question_types/multichoice/multichoice.classes.inc 25 Aug 2009 20:35:40 -0000 @@ -205,21 +205,21 @@ class MultichoiceQuestion extends Abstra if ($only_this_version) { db_query('DELETE FROM {quiz_multichoice_properties} WHERE nid = %d AND vid = %d', $this->node->nid, $this->node->vid); $sql = 'DELETE FROM {quiz_multichoice_user_answers} - WHERE result_id IN( - SELECT result_id - FROM {quiz_node_results} - WHERE question_nid = %d AND question_vid = %d - )'; + WHERE result_id IN( + SELECT result_id + FROM {quiz_node_results} + WHERE question_nid = %d AND question_vid = %d + )'; db_query($sql, $this->node->nid, $this->node->vid); } else { db_query('DELETE FROM {quiz_multichoice_properties} WHERE nid = %d', $this->node->nid); $sql = 'DELETE FROM {quiz_multichoice_user_answers} - WHERE result_id IN( - SELECT result_id - FROM {quiz_node_results} - WHERE question_nid = %d - )'; + WHERE result_id IN( + SELECT result_id + FROM {quiz_node_results} + WHERE question_nid = %d + )'; db_query($sql, $this->node->nid); } } @@ -392,6 +392,7 @@ class MultichoiceQuestion extends Abstra '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, + '#weight' => 3, ); $form['alternatives']['settings'] = array( '#type' => 'fieldset', @@ -504,9 +505,9 @@ class MultichoiceQuestion extends Abstra $default_value = $short['score_if_not_chosen']; if (!isset($default_value)) $default_value = '0'; $form['alternatives'][$i]['advanced']['score_if_not_chosen'] = array( - '#type' => 'textfield', + '#type' => 'textfield', '#title' => t('Score if not chosen'), - '#size' => 4, + '#size' => 4, '#maxlength' => 4, '#default_value' => $default_value, '#description' => t('This score is added to the users total score if the user doesn\'t choose this alternative. Only used if multiple answers are allowed.'), @@ -656,7 +657,7 @@ class MultichoiceResponse extends Abstra )'; db_query($sql, $this->nid, $this->question->vid, $this->rid); $sql = 'DELETE FROM {quiz_multichoice_user_answers} - WHERE result_id = %d AND question_nid = %d AND question_vid = %d'; + WHERE result_id = %d AND question_nid = %d AND question_vid = %d'; db_query($sql, $this->rid, $this->question->nid, $this->question->vid); } Index: question_types/quiz_question/quiz_question.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/quiz_question/quiz_question.module,v retrieving revision 1.2.2.31 diff -u -p -r1.2.2.31 quiz_question.module --- question_types/quiz_question/quiz_question.module 25 Aug 2009 12:22:05 -0000 1.2.2.31 +++ question_types/quiz_question/quiz_question.module 25 Aug 2009 20:35:40 -0000 @@ -171,7 +171,8 @@ function quiz_question_form(&$node, $for '#title' => t('Title'), '#default_value' => $node->title, '#required' => FALSE, - '#description' => t('Add a title that will help distinguish this question from other questions. This will not be seen during the quiz.'), + '#description' => t('Add a title that will help distinguish this question from other questions. This will not be seen during the quiz.'), + '#weight' => 1, ); } else { Index: question_types/short_answer/short_answer.classes.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/short_answer/short_answer.classes.inc,v retrieving revision 1.2.2.22 diff -u -p -r1.2.2.22 short_answer.classes.inc --- question_types/short_answer/short_answer.classes.inc 25 Aug 2009 13:49:01 -0000 1.2.2.22 +++ question_types/short_answer/short_answer.classes.inc 25 Aug 2009 20:35:40 -0000 @@ -12,6 +12,7 @@ * question types that involve textual answers. * * @file + * Class file for short answer question. */ /** @@ -134,6 +135,7 @@ class ShortAnswerQuestion extends Abstra '#description' => t('Provide the answer and the method by which the answer will be evaluated.'), '#collapsible' => TRUE, '#collapsed' => FALSE, + '#weight' => 2, ); $form['answer']['correct_answer_evaluation'] = array( Index: question_types/truefalse/truefalse.classes.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/quiz/question_types/truefalse/truefalse.classes.inc,v retrieving revision 1.1.2.12 diff -u -p -r1.1.2.12 truefalse.classes.inc --- question_types/truefalse/truefalse.classes.inc 25 Aug 2009 12:22:06 -0000 1.1.2.12 +++ question_types/truefalse/truefalse.classes.inc 25 Aug 2009 20:35:40 -0000 @@ -80,9 +80,9 @@ class TrueFalseQuestion extends Abstract '#type' => 'radios', '#title' => t('Choose one'), '#options' => array( - 1 => t('True'), - 0 => t('False') - ), + 1 => t('True'), + 0 => t('False') + ), //'#default_value' => 1, '#required' => TRUE, ); @@ -101,24 +101,27 @@ class TrueFalseQuestion extends Abstract public function getCreationForm($edit) { - $form['correct_answer'] = array( + + $form['answer'] = array( + '#type' => 'fieldset', + '#title' => t('Answer and Feedback'), + //'#description' => t('Settings pertaining to feedback given along with results.'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#weight' => 2, + ); + $form['answer']['correct_answer'] = array( '#type' => 'radios', '#title' => t('Correct answer'), '#options' => array( - 1 => t('True'), - 0 => t('False'), - ), + 1 => t('True'), + 0 => t('False'), + ), '#default_value' => isset($this->node->correct_answer) ? $this->node->correct_answer : 1, '#required' => TRUE, + '#weight' => 3, ); - $form['feedback_fields'] = array( - '#type' => 'fieldset', - '#title' => t('Feedback Settings'), - '#description' => t('Settings pertaining to feedback given along with results.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['feedback_fields']['feedback'] = array( + $form['answer']['feedback'] = array( '#type' => 'textarea', '#title' => t('Feedback Text'), '#description' => t('Text to be displayed when the results are displayed'), @@ -126,8 +129,8 @@ class TrueFalseQuestion extends Abstract '#cols' => 60, '#required' => FALSE, '#default_value' => isset($this->node->feedback) ? $this->node->feedback : '', + '#weight' => 4, ); - return $form; }