From a6ec81723240fdeb8cf6bdee08e604b1c73d54cb Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Wed, 28 Apr 2010 12:09:23 -0500 Subject: [PATCH] fixed - display details of exercises inside reporting when tool is invisible - private BT#924 --- main/mySpace/myStudents.php | 99 +++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 47595662a6..df9f2c65a7 100755 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -689,70 +689,63 @@ if ($timezone !== null) { get_lang('Attempts') ); - $t_tool = Database :: get_course_table(TABLE_TOOL_LIST, $info_course['db_name']); - $sql = 'SELECT visibility FROM ' . $t_tool . ' WHERE name="quiz"'; - $result_visibility_quizz = Database::query($sql); - $t_quiz = Database :: get_course_table(TABLE_QUIZ_TEST, $info_course['db_name']); - - if (Database :: result($result_visibility_quizz, 0, 'visibility') == 1) { - $sql_exercices = "SELECT quiz.title,id - FROM " . $t_quiz . " AS quiz - WHERE active='1' AND quiz.session_id = $session_id ORDER BY quiz.title ASC - "; + $t_quiz = Database :: get_course_table(TABLE_QUIZ_TEST, $info_course['db_name']); + $sql_exercices = "SELECT quiz.title,id + FROM " . $t_quiz . " AS quiz + WHERE active='1' AND quiz.session_id = $session_id ORDER BY quiz.title ASC + "; + + $result_exercices = Database::query($sql_exercices); + $i = 0; + if (Database :: num_rows($result_exercices) > 0) { + while ($exercices = Database :: fetch_array($result_exercices)) { + $exercise_id = intval($exercices['id']); + $count_attempts = Tracking::count_student_exercise_attempts($student_id, $course_code, $exercise_id); + $score_percentage = Tracking::get_avg_student_exercise_score($student_id, $course_code, $exercise_id); - $result_exercices = Database::query($sql_exercices); - $i = 0; - if (Database :: num_rows($result_exercices) > 0) { - while ($exercices = Database :: fetch_array($result_exercices)) { - $exercise_id = intval($exercices['id']); - $count_attempts = Tracking::count_student_exercise_attempts($student_id, $course_code, $exercise_id); - $score_percentage = Tracking::get_avg_student_exercise_score($student_id, $course_code, $exercise_id); - - $csv_content[] = array ( - $exercices['title'], - $score_percentage . '%', - $count_attempts - ); + $csv_content[] = array ( + $exercices['title'], + $score_percentage . '%', + $count_attempts + ); - if ($i % 2 == 0) $css_class = 'row_odd'; - else $css_class = 'row_even'; + if ($i % 2 == 0) $css_class = 'row_odd'; + else $css_class = 'row_even'; - echo ''.$exercices['title'].''; - - echo ''; - - if ($count_attempts > 0) { - echo $score_percentage . '%'; - } else { - echo '/'; - $score_percentage = 0; - } - - echo ''; - echo ''.$count_attempts.''; - echo ''; + echo ''.$exercices['title'].''; + + echo ''; + + if ($count_attempts > 0) { + echo $score_percentage . '%'; + } else { + echo '/'; + $score_percentage = 0; + } - $sql_last_attempt = 'SELECT exe_id FROM ' . $tbl_stats_exercices . ' WHERE exe_exo_id="'.$exercise_id.'" AND exe_user_id="'.$student_id.'" AND exe_cours_id="'.$course_code.'" AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_date DESC LIMIT 1'; - $result_last_attempt = Database::query($sql_last_attempt); - if (Database :: num_rows($result_last_attempt) > 0) { - $id_last_attempt = Database :: result($result_last_attempt, 0, 0); - if ($count_attempts > 0) - echo ' '; - } - echo ''; - $data_exercices[$i][] = $exercices['title']; - $data_exercices[$i][] = $score_percentage . '%'; - $data_exercices[$i][] = $count_attempts; - $i++; + echo ''; + echo ''.$count_attempts.''; + echo ''; + $sql_last_attempt = 'SELECT exe_id FROM ' . $tbl_stats_exercices . ' WHERE exe_exo_id="'.$exercise_id.'" AND exe_user_id="'.$student_id.'" AND exe_cours_id="'.$course_code.'" AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_date DESC LIMIT 1'; + $result_last_attempt = Database::query($sql_last_attempt); + if (Database :: num_rows($result_last_attempt) > 0) { + $id_last_attempt = Database :: result($result_last_attempt, 0, 0); + if ($count_attempts > 0) + echo ' '; } - } else { - echo ''.get_lang('NoExercise').''; + echo ''; + $data_exercices[$i][] = $exercices['title']; + $data_exercices[$i][] = $score_percentage . '%'; + $data_exercices[$i][] = $count_attempts; + $i++; + } } else { echo ''.get_lang('NoExercise').''; } + ?>