From f0d66c766d0c352b5938fef58cf692c4fe94391c Mon Sep 17 00:00:00 2001 From: Francis Gonzales Date: Tue, 1 Apr 2014 20:17:55 -0500 Subject: [PATCH] add a column description - refs BT# --- main/inc/ajax/model.ajax.php | 1 + main/inc/lib/tracking.lib.php | 5 +++-- main/mySpace/myspace.lib.php | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index bb98ac1f77..a4f70387eb 100644 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -643,6 +643,7 @@ switch ($action) { 'time', 'question_id', 'question', + 'description', 'answer', 'correct', ); diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 29c1da6e61..8dc4e2768f 100644 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3596,13 +3596,14 @@ class Tracking ta.tms as time, te.exe_exo_id as quiz_id, CONCAT ('c', q.c_id, '_e', q.id) as exercise_id, - q.title as quiz_title + q.title as quiz_title, + q.description FROM $ttrack_exercises te, $ttrack_attempt ta, $tquiz q WHERE te.exe_cours_id = '$whereCourseCode' ".(empty($whereSessionParams)?'':"AND te.session_id IN ($whereSessionParams)")." AND ta.exe_id = te.exe_id AND q.c_id = $courseIdx AND q.id = te.exe_exo_id $where $order $limit"; $sql_query = vsprintf($sql, $whereParams); - + // Now browse through the results and get the data $rs = Database::query($sql_query); $userIds = array(); diff --git a/main/mySpace/myspace.lib.php b/main/mySpace/myspace.lib.php index 8eef05fabb..8e4dcfd784 100644 --- a/main/mySpace/myspace.lib.php +++ b/main/mySpace/myspace.lib.php @@ -366,6 +366,7 @@ class MySpace { get_lang('Time'), get_lang('QuestionId'), get_lang('QuestionTitle'), + get_lang('langWorkDescription'), get_lang('Answer'), get_lang('Correct'), ); @@ -383,8 +384,9 @@ class MySpace { array('name'=>'time', 'index'=>'time', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), 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'=>'description', 'index'=>'description', '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"), + array('name'=>'correct', 'index'=>'correct', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), ); //get dynamic column names