';
$i++;
//validacion when belongs to a session
@@ -489,7 +483,7 @@ if ($is_allowedToEdit) {
}
}
}
- }
+ }
//Blocking empty start times see BT#2800
@@ -504,9 +498,11 @@ if ($is_allowedToEdit) {
// Teacher only
if ($is_allowedToEdit) {
$show_quiz_edition = true;
- $table_lp_item = Database::get_course_table(TABLE_LP_ITEM);
+
$sql="SELECT max_score FROM $table_lp_item
- WHERE item_type = '".TOOL_QUIZ."' AND path ='".Database::escape_string($row['id'])."'";
+ WHERE c_id = $course_id AND
+ item_type = '".TOOL_QUIZ."' AND
+ path ='".Database::escape_string($row['id'])."'";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$show_quiz_edition = false;
@@ -518,7 +514,7 @@ if ($is_allowedToEdit) {
}
//Showing exercise title
- $row['title'] = text_filter(cut($row['title'], EXERCISE_MAX_NAME_SIZE));
+ $row['title'] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
if ($session_id == $row['session_id']) {
//Settings
@@ -535,15 +531,17 @@ if ($is_allowedToEdit) {
$exid = $row['id'];
//count number exercice - teacher
- $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = '" . $exid . "'";
+ $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE c_id = $course_id AND exercice_id = $exid";
$sqlresult = Database::query($sqlquery);
$rowi = Database :: result($sqlresult, 0);
+
+ $count = count_exercise_result($exid, $course_code, $session_id);
if ($session_id == $row['session_id']) {
//Settings
//$actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',22), 'exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$row['id']);
$actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',22), 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id']);
- $actions .='
' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).'';
+ $actions .='
' . $count.' '.Display :: return_icon('test_results.png', get_lang('Results'),'',22).'';
//Export
$actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id']));
//Clean exercise
@@ -556,9 +554,11 @@ if ($is_allowedToEdit) {
}
// Export qti ...
$actions .= Display::url(Display::return_icon('export_qti2.png','IMS/QTI','','22'), 'exercice.php?choice=exportqti2&exerciseId='.$row['id']);
- } else { // not session resource
+ } else {
+ // not session
$actions = Display::return_icon('edit_na.png', get_lang('ExerciseEditionNotAvailableInSession'));
- $actions .='
' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).'';
+
+ $actions .='
'.Display :: return_icon('test_results.png', get_lang('Results'),'',22).'';
$actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id']));
}
@@ -620,7 +620,7 @@ if ($is_allowedToEdit) {
$item = Display::tag('td',$url.' '.$session_img);
//count number exercise questions
- $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = ".$row['id'];
+ $sqlquery = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE c_id = $course_id AND exercice_id = ".$row['id'];
$sqlresult = Database::query($sqlquery);
$rowi = Database::result($sqlresult, 0);
diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php
index 8a0b23e7f9..422f682ea0 100644
--- a/main/inc/lib/events.lib.inc.php
+++ b/main/inc/lib/events.lib.inc.php
@@ -904,7 +904,7 @@ function get_all_exercise_results_by_course($course_code, $session_id = 0, $get_
if ($get_count) {
$select = 'count(*) as count';
}
- $sql = "SELECT $select FROM $table_track_exercises WHERE status = '' AND exe_cours_id = '$course_code' AND session_id = $session_id AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_id";
+ $sql = "SELECT $select FROM $table_track_exercises WHERE status = '' AND exe_cours_id = '$course_code' AND session_id = $session_id AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_id";
$res = Database::query($sql);
if ($get_count) {
$row = Database::fetch_array($res,'ASSOC');
@@ -955,10 +955,6 @@ function get_all_exercise_results_by_user($user_id, $course_code, $session_id =
return $list;
}
-
-
-
-
/**
* Gets exercise results (NO Exercises in LPs) from a given exercise id, course, session
* @param int exercise id
@@ -1110,11 +1106,7 @@ function get_best_exercise_results_by_user($exercise_id, $course_code, $session_
while($row_q = Database::fetch_array($res_question,'ASSOC')) {
$list[$row['exe_id']]['question_list'][$row_q['question_id']] = $row_q;
}
- }
- /*
- echo count($list);
- echo '
';
- echo '
'; print_r($list);*/
+ }
//Getting the best results of every student
$best_score_return = array();
@@ -1125,13 +1117,32 @@ function get_best_exercise_results_by_user($exercise_id, $course_code, $session_
if ($current_best_score[$user_id] > $best_score_return[$user_id]['exe_result']) {
$best_score_return[$user_id] = $student_result;
}
- }
- /*
- echo count($best_score_return);
- echo ''; print_r($best_score_return);*/
+ }
return $best_score_return;
}
+function count_exercise_result($exercise_id, $course_code, $session_id = 0) {
+ $table_track_exercises = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
+
+ $course_code = Database::escape_string($course_code);
+
+ $session_id = intval($session_id);
+ $exercise_id = intval($exercise_id);
+ $select = '*';
+ $sql = "SELECT count(*) as count FROM $table_track_exercises
+ WHERE status = '' AND
+ exe_exo_id = $exercise_id AND
+ exe_cours_id = '$course_code' AND
+ session_id = $session_id AND
+ orig_lp_id = 0 AND
+ orig_lp_item_id = 0 ORDER BY exe_id";
+ $res = Database::query($sql);
+
+ $row = Database::fetch_array($res,'ASSOC');
+ return $row['count'];
+
+}
+
/**
* Gets all exercise BEST results attempts (NO Exercises in LPs ) from a given exercise id, course, session per user