|
|
|
|
@ -664,8 +664,8 @@ class Exercise |
|
|
|
|
$sql = "SELECT q.iid |
|
|
|
|
FROM $TBL_EXERCICE_QUESTION e |
|
|
|
|
INNER JOIN $TBL_QUESTIONS q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = ".$this->course_id." ) |
|
|
|
|
WHERE e.exercice_id = '".$this->id."' "; |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE e.exercice_id = '".$this->id."' AND e.c_id = {$this->course_id}"; |
|
|
|
|
|
|
|
|
|
$orderCondition = ' ORDER BY question_order '; |
|
|
|
|
|
|
|
|
|
@ -760,10 +760,10 @@ class Exercise |
|
|
|
|
{ |
|
|
|
|
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
|
|
|
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION); |
|
|
|
|
$sql = "SELECT count(q.id) as count |
|
|
|
|
$sql = "SELECT count(q.iid) as count |
|
|
|
|
FROM $TBL_EXERCICE_QUESTION e |
|
|
|
|
INNER JOIN $TBL_QUESTIONS q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = ".$this->id; |
|
|
|
|
@ -794,7 +794,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT e.question_id |
|
|
|
|
FROM $exerciseQuestionTable e |
|
|
|
|
INNER JOIN $questionTable q |
|
|
|
|
ON (e.question_id= q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id= q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = '".$this->id."' |
|
|
|
|
@ -1165,7 +1165,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT e.question_id |
|
|
|
|
FROM $quizRelQuestion e |
|
|
|
|
INNER JOIN $question q |
|
|
|
|
ON (e.question_id= q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id= q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = '".Database::escape_string($this->id)."' |
|
|
|
|
@ -1211,12 +1211,12 @@ class Exercise |
|
|
|
|
|
|
|
|
|
$TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
|
|
|
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION); |
|
|
|
|
$sql = "SELECT q.id |
|
|
|
|
$sql = "SELECT q.iid |
|
|
|
|
FROM $TBL_EXERCICE_QUESTION e |
|
|
|
|
INNER JOIN $TBL_QUESTIONS q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.id |
|
|
|
|
WHERE |
|
|
|
|
q.id = $questionId AND |
|
|
|
|
q.iid = $questionId AND |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = ".$this->id; |
|
|
|
|
|
|
|
|
|
@ -1231,10 +1231,10 @@ class Exercise |
|
|
|
|
|
|
|
|
|
$table = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
|
|
|
$tableQuestion = Database::get_course_table(TABLE_QUIZ_QUESTION); |
|
|
|
|
$sql = "SELECT q.id |
|
|
|
|
$sql = "SELECT q.iid |
|
|
|
|
FROM $table e |
|
|
|
|
INNER JOIN $tableQuestion q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
q.type = $type AND |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
@ -1255,10 +1255,10 @@ class Exercise |
|
|
|
|
|
|
|
|
|
$table = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
|
|
|
$tableQuestion = Database::get_course_table(TABLE_QUIZ_QUESTION); |
|
|
|
|
$sql = "SELECT q.id |
|
|
|
|
$sql = "SELECT q.iid |
|
|
|
|
FROM $table e |
|
|
|
|
INNER JOIN $tableQuestion q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
q.type NOT IN ('$questionTypeToString') AND |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
@ -3061,7 +3061,7 @@ class Exercise |
|
|
|
|
unset($di); |
|
|
|
|
$tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION); |
|
|
|
|
foreach ($this->questionList as $question_i) { |
|
|
|
|
$sql = 'SELECT type FROM %s WHERE id=%s'; |
|
|
|
|
$sql = 'SELECT type FROM %s WHERE iid=%s'; |
|
|
|
|
$sql = sprintf($sql, $tbl_quiz_question, $question_i); |
|
|
|
|
$qres = Database::query($sql); |
|
|
|
|
if (Database::num_rows($qres) > 0) { |
|
|
|
|
@ -8042,7 +8042,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT DISTINCT cat.* |
|
|
|
|
FROM $TBL_EXERCICE_QUESTION e |
|
|
|
|
INNER JOIN $TBL_QUESTIONS q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
INNER JOIN $categoryRelTable catRel |
|
|
|
|
ON (catRel.question_id = e.question_id AND catRel.c_id = e.c_id) |
|
|
|
|
INNER JOIN $categoryTable cat |
|
|
|
|
@ -8780,7 +8780,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT DISTINCT e.question_id |
|
|
|
|
FROM $quizRelQuestion e |
|
|
|
|
INNER JOIN $question q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = '".$this->id."' |
|
|
|
|
@ -10991,7 +10991,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT DISTINCT count(e.question_order) as count |
|
|
|
|
FROM $TBL_EXERCICE_QUESTION e |
|
|
|
|
INNER JOIN $TBL_QUESTIONS q |
|
|
|
|
ON (e.question_id = q.id AND e.c_id = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = ".$this->id; |
|
|
|
|
@ -11004,7 +11004,7 @@ class Exercise |
|
|
|
|
$sql = "SELECT DISTINCT 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 = q.c_id) |
|
|
|
|
ON e.question_id = q.iid |
|
|
|
|
WHERE |
|
|
|
|
e.c_id = {$this->course_id} AND |
|
|
|
|
e.exercice_id = '".$this->id."' |
|
|
|
|
|