diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index d7690e4cba..aab79c1607 100644 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -640,7 +640,7 @@ switch ($action) { 'question_id', 'question', 'answer', - 'correct' + 'correct', ); $result = Tracking::get_exercise_progress($sessionId, $courseId, $exerciseId, $answer, diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index dc3a7bf015..28cf5df060 100644 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3306,14 +3306,14 @@ class Tracking $data[] = $row; } // Now fill questions data. Query all questions and answers for this test to avoid - $sqlQuestions = "SELECT tq.c_id, tq.id as question_id, tq.question, tqa.id_auto, tqa.answer + $sqlQuestions = "SELECT tq.c_id, tq.id as question_id, tq.question, tqa.id_auto, tqa.answer, tqa.correct FROM $tquiz_question tq, $tquiz_answer tqa WHERE tqa.question_id =tq.id and tqa.c_id = tq.c_id AND tq.c_id = $courseIdx AND tq.id IN (".implode(',',$questionIds).")"; $resQuestions = Database::query($sqlQuestions); while ($rowQuestion = Database::fetch_assoc($resQuestions)) { $questionIds[$rowQuestion['question_id']] = $rowQuestion['question']; - $answerIds[$rowQuestion['question_id']] = array('answer' => $rowQuestion['answer']); + $answerIds[$rowQuestion['question_id']] = array('answer' => $rowQuestion['answer'], 'correct' =>$rowQuestion['correct']); } // Now fill users data $sqlUsers = "SELECT user_id, username, lastname, firstname FROM $tuser WHERE user_id IN (".implode(',',$userIds).")"; @@ -3326,10 +3326,9 @@ class Tracking $data[$id]['lastname'] = $users[$row['user_id']]['lastname']; $data[$id]['username'] = $users[$row['user_id']]['username']; $data[$id]['answer'] = $answerIds[$row['question_id']]['answer']; - //$data[$id]['correct'] = $answerIds[$row['question_id']][$row['answer_id']]['correct']; - //$data[$id]['correct'] = ($data[$id]['correct']==0?get_lang('No'):get_lang('Yes')); + $data[$id]['correct'] = $answerIds[$row['question_id']]['correct']; + $data[$id]['correct'] = ($data[$id]['correct'] == 0 ? get_lang('No') : get_lang('Yes')); $data[$id]['question'] = $questionIds[$row['question_id']]; - } /* diff --git a/main/mySpace/myspace.lib.php b/main/mySpace/myspace.lib.php index c5c3a56644..8186c6b283 100644 --- a/main/mySpace/myspace.lib.php +++ b/main/mySpace/myspace.lib.php @@ -368,6 +368,7 @@ class MySpace { get_lang('QuestionId'), get_lang('QuestionTitle'), get_lang('Answer'), + get_lang('Correct'), ); /** @@ -384,6 +385,7 @@ class MySpace { array('name'=>'question_id', 'index'=>'question_id', 'align'=>'left', 'search' => 'true'), array('name'=>'question', 'index'=>'question', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), array('name'=>'answer', 'index'=>'answer', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), + array('name'=>'correct', 'index'=>'correct', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), ); //get dynamic column names