chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

"only one question in exercise bug" fixed. When question_order is 1,1,1,1 instead of 1,2,3,4 see BT#5140

Browse Source
skala
Julio Montoya 13 years ago
parent cefe88f8aa
commit 302fef972f
1 changed files with 36 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 52
      main/exercice/exercise.class.php

52
main/exercice/exercise.class.php
Unescape View File

@ -100,9 +100,8 @@ class Exercise {
* @return - boolean - true if exercise exists, otherwise false
*/
function read($id) {
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$id = intval($id);
if (empty($this->course_id)) {
return false;
@ -140,21 +139,8 @@ class Exercise {
}
$this->expired_time = $object->expired_time; //control time
$sql = "SELECT e.question_id, e.question_order FROM $TBL_EXERCICE_QUESTION e, $TBL_QUESTIONS q
WHERE e.question_id = q.id AND
e.exercice_id = '".Database::escape_string($id)."' AND
e.c_id = ".$this->course_id." AND
q.c_id = ".$this->course_id."
ORDER BY question_order";
$result = Database::query($sql);
// fills the array with the question ID for this exercise
// the key of the array is the question position
while ($new_object = Database::fetch_object($result)) {
$this->questionList[$new_object->question_order]= $new_object->question_id;
}
//Checking if question_order is correctly set
$this->questionList = $this->selectQuestionList(true);
//overload questions list with recorded questions list
//load questions only for exercises of type 'one question per page'
@ -165,7 +151,6 @@ class Exercise {
global $_configuration, $questionList;
if ($this->type == ONE_PER_PAGE && $_SERVER['REQUEST_METHOD'] != 'POST' && defined('QUESTION_LIST_ALREADY_LOGGED') &&
isset($_configuration['live_exercise_tracking']) && $_configuration['live_exercise_tracking']) {
//if(empty($_SESSION['questionList']))
$this->questionList = $questionList;
}
return true;
@ -390,16 +375,37 @@ class Exercise {
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$sql = "SELECT question_id, question_order FROM $TBL_EXERCICE_QUESTION eq , $TBL_QUESTIONS q
WHERE eq.question_id = q.id AND
exercice_id='".$this->id."' AND
eq.c_id = {$this->course_id} AND
q.c_id = {$this->course_id}
$sql = "SELECT DISTINCT e.question_order
FROM $TBL_EXERCICE_QUESTION e INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.id AND e.c_id = ".$this->course_id." AND q.c_id = ".$this->course_id.")
WHERE e.exercice_id = '".Database::escape_string($this->id)."'";
$result = Database::query($sql);
$count_question_orders = Database::num_rows($result);
$sql = "SELECT e.question_id, e.question_order
FROM $TBL_EXERCICE_QUESTION e INNER JOIN $TBL_QUESTIONS q
ON (e.question_id = q.id AND e.c_id = ".$this->course_id." AND q.c_id = ".$this->course_id.")
WHERE e.exercice_id = '".Database::escape_string($this->id)."'
ORDER BY question_order";
$result = Database::query($sql);
// fills the array with the question ID for this exercise
// the key of the array is the question position
$temp_question_list = array();
$counter = 1;
$question_list = array();
while ($new_object = Database::fetch_object($result)) {
$question_list[$new_object->question_order]= $new_object->question_id;
$temp_question_list[$counter] = $new_object->question_id;
$counter++;
}
if (!empty($temp_question_list)) {
if (count($temp_question_list) != $count_question_orders) {
$question_list = $temp_question_list;
}
}
return $question_list;
}

Write Preview
Loading…
Cancel
Save