diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 132cc2013a..7bff68f2d6 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -1580,6 +1580,7 @@ class Exercise { $new_array = array(); if (Database::num_rows($result) > 0 ) { $new_array = Database::fetch_array($result, 'ASSOC'); + $new_array['num_exe'] = Database::num_rows($result); } return $new_array; } diff --git a/main/exercice/overview.php b/main/exercice/overview.php index 2b3e94f8bf..ca4db091a4 100644 --- a/main/exercice/overview.php +++ b/main/exercice/overview.php @@ -98,7 +98,7 @@ if (isset($exercise_stat_info['exe_id'])) { } //1. Check if this is a new attempt or a previous -$countNotFinished = get_attempt_count_incomplete(api_get_user_id(), $objExercise->selectId(), $learnpath_id, $learnpath_item_id); +$countNotFinished = $exercise_stat_info['num_exe']; $label = get_lang('StartTest'); if ($time_control && !empty($clock_expired_time) || !empty($attempt_list)) { $label = get_lang('ContinueTest'); diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php index f2db84fb1f..29d54ef627 100644 --- a/main/inc/lib/events.lib.inc.php +++ b/main/inc/lib/events.lib.inc.php @@ -835,32 +835,6 @@ function get_attempt_count_not_finished($user_id, $exerciseId, $lp_id, $lp_item_ } } -function get_attempt_count_incomplete($user_id, $exerciseId, $lp_id, $lp_item_id) { - $stat_table = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); - $user_id = intval($user_id); - $exerciseId = intval($exerciseId); - $lp_id = intval($lp_id); - $lp_item_id = intval($lp_item_id); - $lp_item_view_id= intval($lp_item_view_id); - - $sql = "SELECT count(*) as count FROM $stat_table WHERE - exe_exo_id = $exerciseId AND - exe_user_id = $user_id AND - status = 'incomplete' AND - orig_lp_id = $lp_id AND - orig_lp_item_id = $lp_item_id AND - exe_cours_id = '".api_get_course_id()."' AND - session_id = '" . api_get_session_id() . "'"; - - $query = Database::query($sql); - if (Database::num_rows($query) > 0 ) { - $attempt = Database :: fetch_array($query,'ASSOC'); - return $attempt['count']; - } else { - return 0; - } -} - function delete_student_lp_events($user_id, $lp_id, $course, $session_id) {