diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php index 6dcb664d61..5f2a52128e 100755 --- a/main/exercise/exercise.class.php +++ b/main/exercise/exercise.class.php @@ -179,7 +179,7 @@ class Exercise } $sql = "SELECT * FROM $table - WHERE c_id = ".$this->course_id." AND id = ".$id; + WHERE iid = ".$id; $result = Database::query($sql); // if the exercise has been found @@ -1792,7 +1792,7 @@ class Exercise $sql = "UPDATE $TBL_EXERCISES SET question_selection_type= ".$this->getQuestionSelectionType()." - WHERE id = ".$this->id." AND c_id = ".$this->course_id; + WHERE iid = ".$this->id; Database::query($sql); // insert into the item_property table @@ -1944,7 +1944,7 @@ class Exercise $table = Database::get_course_table(TABLE_QUIZ_TEST); $sql = "UPDATE $table SET active='-1' - WHERE c_id = ".$this->course_id." AND id = ".intval($this->id); + WHERE iid = ".intval($this->id); Database::query($sql); api_item_property_update( @@ -8175,7 +8175,7 @@ class Exercise cq.c_id = %s AND (cq.session_id = %s OR cq.session_id = 0) AND cq.active = 0 - ORDER BY cq.id"; + ORDER BY cq.iid"; $sql = sprintf($sql, $courseId, $sessionId); $result = Database::query($sql); @@ -9105,7 +9105,7 @@ class Exercise $invisibleSql = "SELECT e.iid FROM $TBL_EXERCISES e INNER JOIN $TBL_ITEM_PROPERTY ip - ON (e.id = ip.ref AND e.c_id = ip.c_id) + ON (e.iid = ip.ref AND e.c_id = ip.c_id) WHERE ip.tool = '".TOOL_QUIZ."' AND e.c_id = $courseId AND @@ -9243,7 +9243,7 @@ class Exercise $mylpitemid = empty($learnpath_item_id) ? '' : '&learnpath_item_id='.$learnpath_item_id; foreach ($exerciseList as $row) { $currentRow = []; - $my_exercise_id = $row['id']; + $my_exercise_id = $row['iid']; $attempt_text = ''; $actions = ''; $exercise = new Exercise($returnData ? $courseId : 0); @@ -9373,8 +9373,8 @@ class Exercise ' '.Display::return_icon('quiz.png', $row['title']).' '.$title.' @@ -9397,13 +9397,13 @@ class Exercise // Questions list $actions = Display::url( Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL), - 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id'] + 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['iid'] ); // Test settings $settings = Display::url( Display::return_icon('settings.png', get_lang('Configure'), '', ICON_SIZE_SMALL), - 'exercise_admin.php?'.api_get_cidreq().'&exerciseId='.$row['id'] + 'exercise_admin.php?'.api_get_cidreq().'&exerciseId='.$row['iid'] ); if ($limitTeacherAccess && !api_is_platform_admin()) { @@ -9412,7 +9412,7 @@ class Exercise $actions .= $settings; // Exercise results - $resultsLink = ''. + $resultsLink = ''. Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).''; if ($limitTeacherAccess) { @@ -9435,7 +9435,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=enable_launch&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=enable_launch&sec_token='.$token.'&exerciseId='.$row['iid'] ); } else { $actions .= Display::url( @@ -9445,7 +9445,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=disable_launch&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=disable_launch&sec_token='.$token.'&exerciseId='.$row['iid'] ); } } @@ -9456,7 +9456,7 @@ class Exercise '', [ 'onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'), ENT_QUOTES, $charset))." ".addslashes($row['title'])."?"."')) return false;", - 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'], + 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['iid'], ] ); @@ -9481,7 +9481,7 @@ class Exercise ) )." ".addslashes($row['title'])."?"."')) return false;", 'href' => 'exercise.php?'.api_get_cidreq( - ).'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['id'], + ).'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['iid'], ] ); } else { @@ -9514,7 +9514,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&exerciseId='.$row['iid'] ); } else { // else if not active @@ -9525,7 +9525,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&exerciseId='.$row['iid'] ); } } @@ -9544,7 +9544,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?action=exportqti2&exerciseId='.$row['id'].'&'.api_get_cidreq() + 'exercise.php?action=exportqti2&exerciseId='.$row['iid'].'&'.api_get_cidreq() ); if ($limitTeacherAccess && !api_is_platform_admin()) { @@ -9576,7 +9576,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&exerciseId='.$row['iid'] ); } else { // else if not active @@ -9587,7 +9587,7 @@ class Exercise '', ICON_SIZE_SMALL ), - 'exercise.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&exerciseId='.$row['id'] + 'exercise.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&exerciseId='.$row['iid'] ); } } @@ -9597,14 +9597,14 @@ class Exercise } $actions .= $visibility; - $actions .= ''. + $actions .= ''. Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).''; $actions .= Display::url( Display::return_icon('cd.gif', get_lang('CopyExercise')), '', [ 'onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'), ENT_QUOTES, $charset))." ".addslashes($row['title'])."?"."')) return false;", - 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'], + 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['iid'], ] ); } @@ -9623,7 +9623,7 @@ class Exercise '', [ 'onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteJS'), ENT_QUOTES, $charset))." ".addslashes($exercise->getUnformattedTitle())."?"."')) return false;", - 'href' => 'exercise.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'], + 'href' => 'exercise.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['iid'], ] ); } else { @@ -9694,7 +9694,7 @@ class Exercise continue; } - $url = ''. + $url = ''. $cut_title.''; // Link of the exercise. @@ -9708,7 +9708,7 @@ class Exercise // Don't remove this marker: note-query-exe-results $sql = "SELECT * FROM $TBL_TRACK_EXERCISES WHERE - exe_exo_id = ".$row['id']." AND + exe_exo_id = ".$row['iid']." AND exe_user_id = $userId AND c_id = ".api_get_course_int_id()." AND status <> 'incomplete' AND @@ -9829,7 +9829,7 @@ class Exercise $currentRow['attempt'] = $attempt_text; if ($is_allowedToEdit) { - $additionalActions = ExerciseLib::getAdditionalTeacherActions($row['id']); + $additionalActions = ExerciseLib::getAdditionalTeacherActions($row['iid']); if (!empty($additionalActions)) { $actions .= $additionalActions.PHP_EOL; @@ -9841,7 +9841,7 @@ class Exercise } $currentRow = [ - $row['id'], + $row['iid'], $currentRow['title'], $currentRow['count_questions'], $actions, @@ -9853,7 +9853,7 @@ class Exercise ]; if ($isDrhOfCourse) { - $currentRow[] = ''. + $currentRow[] = ''. Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).''; } @@ -9861,7 +9861,7 @@ class Exercise $currentRow['id'] = $exercise->id; $currentRow['url'] = $webPath.'exercise/overview.php?' .api_get_cidreq_params($courseInfo['code'], $sessionId).'&' - ."$mylpid$mylpitemid&exerciseId={$row['id']}"; + ."$mylpid$mylpitemid&exerciseId={$row['iid']}"; $currentRow['name'] = $currentRow[0]; } } diff --git a/main/exercise/exercise.php b/main/exercise/exercise.php index a67c71b3fe..d0dbc0169c 100644 --- a/main/exercise/exercise.php +++ b/main/exercise/exercise.php @@ -113,10 +113,10 @@ if ($is_allowedToEdit) { $quantity_results_deleted = 0; foreach ($exerciseList as $exeItem) { // delete result for test, if not in a gradebook - $exercise_action_locked = api_resource_is_locked_by_gradebook($exeItem['id'], LINK_EXERCISE); + $exercise_action_locked = api_resource_is_locked_by_gradebook($exeItem['iid'], LINK_EXERCISE); if ($exercise_action_locked == false) { $objExerciseTmp = new Exercise(); - if ($objExerciseTmp->read($exeItem['id'])) { + if ($objExerciseTmp->read($exeItem['iid'])) { $quantity_results_deleted += $objExerciseTmp->cleanResults(true); } } diff --git a/main/exercise/exercise_result.class.php b/main/exercise/exercise_result.class.php index 60e5e31d81..734e4a7bf0 100755 --- a/main/exercise/exercise_result.class.php +++ b/main/exercise/exercise_result.class.php @@ -92,7 +92,7 @@ class ExerciseResult te.status as exstatus FROM $TBL_EXERCISES AS ce INNER JOIN $TBL_TRACK_EXERCISES AS te - ON (te.exe_exo_id = ce.id) + ON (te.exe_exo_id = ce.iid) INNER JOIN $TBL_USER AS user ON (user.user_id = exe_user_id) LEFT JOIN $TBL_TABLE_LP_MAIN AS tlm @@ -129,7 +129,7 @@ class ExerciseResult te.status as exstatus FROM $TBL_EXERCISES AS ce INNER JOIN $TBL_TRACK_EXERCISES AS te - ON (te.exe_exo_id = ce.id) + ON (te.exe_exo_id = ce.iid) INNER JOIN $TBL_USER AS user ON (user.user_id = exe_user_id) LEFT JOIN $TBL_TABLE_LP_MAIN AS tlm diff --git a/main/exercise/exercise_show.php b/main/exercise/exercise_show.php index 9cc4df0a73..10b5cede53 100755 --- a/main/exercise/exercise_show.php +++ b/main/exercise/exercise_show.php @@ -32,7 +32,7 @@ if (empty($track_exercise_info)) { api_not_allowed($printHeaders); } -$exercise_id = $track_exercise_info['id']; +$exercise_id = $track_exercise_info['iid']; $student_id = $track_exercise_info['exe_user_id']; $learnpath_id = $track_exercise_info['orig_lp_id']; $learnpath_item_id = $track_exercise_info['orig_lp_item_id']; diff --git a/main/exercise/pending.php b/main/exercise/pending.php index e97150d025..498e5c5700 100644 --- a/main/exercise/pending.php +++ b/main/exercise/pending.php @@ -32,7 +32,7 @@ switch ($action) { ); if (!empty($results)) { foreach ($results as $exercise) { - $data[] = ['id' => $exercise['id'], 'text' => html_entity_decode($exercise['title'])]; + $data[] = ['id' => $exercise['iid'], 'text' => html_entity_decode($exercise['title'])]; } } diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php index cc4f006649..0998541461 100755 --- a/main/exercise/question.class.php +++ b/main/exercise/question.class.php @@ -187,7 +187,7 @@ abstract class Question $sql = "SELECT DISTINCT q.exercice_id FROM $TBL_EXERCISE_QUESTION q INNER JOIN $tblQuiz e - ON e.c_id = q.c_id AND e.id = q.exercice_id + ON e.c_id = q.c_id AND e.iid = q.exercice_id WHERE q.c_id = $course_id AND q.question_id = $id AND diff --git a/main/exercise/question_create.php b/main/exercise/question_create.php index 1e6c150cbc..4200b52686 100755 --- a/main/exercise/question_create.php +++ b/main/exercise/question_create.php @@ -47,14 +47,14 @@ $session_id = api_get_session_id(); $tbl_exercises = Database::get_course_table(TABLE_QUIZ_TEST); $course_id = api_get_course_int_id(); -$sql = "SELECT id,title,type,description, results_disabled +$sql = "SELECT iid,title,type,description, results_disabled FROM $tbl_exercises WHERE c_id = $course_id AND active<>'-1' AND session_id=".$session_id." ORDER BY title ASC"; $result = Database::query($sql); $exercises['-'] = '-'.get_lang('SelectExercise').'-'; while ($row = Database :: fetch_array($result)) { - $exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE); + $exercises[$row['iid']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE); } $form->addElement('select', 'exercise', get_lang('Exercise'), $exercises); @@ -83,7 +83,7 @@ if ($form->validate()) { // check feedback_type from current exercise for type of question delineation $exercise_id = intval($values['exercise']); - $sql = "SELECT feedback_type FROM $tbl_exercises WHERE c_id = $course_id AND id = '$exercise_id'"; + $sql = "SELECT feedback_type FROM $tbl_exercises WHERE iid = '$exercise_id'"; $rs_feedback_type = Database::query($sql); $row_feedback_type = Database::fetch_row($rs_feedback_type); $feedback_type = $row_feedback_type[0]; diff --git a/main/exercise/question_pool.php b/main/exercise/question_pool.php index 4c29882207..9ac9a8520d 100755 --- a/main/exercise/question_pool.php +++ b/main/exercise/question_pool.php @@ -399,16 +399,16 @@ $my_exercise_list['-1'] = get_lang('OrphanQuestions'); $titleSavedAsHtml = api_get_configuration_value('save_titles_as_html'); if (is_array($exercise_list)) { foreach ($exercise_list as $row) { - $my_exercise_list[$row['id']] = ''; - if ($row['id'] == $fromExercise && $selected_course == api_get_course_int_id()) { - $my_exercise_list[$row['id']] = ">    "; + $my_exercise_list[$row['iid']] = ''; + if ($row['iid'] == $fromExercise && $selected_course == api_get_course_int_id()) { + $my_exercise_list[$row['iid']] = ">    "; } $exerciseTitle = $row['title']; if ($titleSavedAsHtml) { $exerciseTitle = strip_tags(api_html_entity_decode(trim($exerciseTitle))); } - $my_exercise_list[$row['id']] .= $exerciseTitle; + $my_exercise_list[$row['iid']] .= $exerciseTitle; } } @@ -725,7 +725,7 @@ function getQuestions( INNER JOIN $TBL_EXERCISE_QUESTION r ON (qu.c_id = r.c_id AND qu.id = r.question_id) INNER JOIN $TBL_EXERCISES ex - ON (ex.id = r.exercice_id AND ex.c_id = r.c_id) + ON (ex.iid = r.exercice_id AND ex.c_id = r.c_id) $from {$efConditions['from']} WHERE @@ -815,7 +815,7 @@ function getQuestions( INNER JOIN $TBL_EXERCISE_QUESTION as qt ON (qu.id = qt.question_id AND qu.c_id = qt.c_id) INNER JOIN $TBL_EXERCISES as q - ON (q.c_id = qu.c_id AND q.id = qt.exercice_id) + ON (q.c_id = qu.c_id AND q.iid = qt.exercice_id) {$efConditions['from']} $from WHERE diff --git a/main/extra/myStudents.php b/main/extra/myStudents.php index a4b1864652..a7b4c2f397 100644 --- a/main/extra/myStudents.php +++ b/main/extra/myStudents.php @@ -1117,7 +1117,7 @@ if (!empty($studentId)) { 'quiz.session_id' ); - $sql = "SELECT quiz.title, id FROM $t_quiz AS quiz + $sql = "SELECT quiz.title, iid FROM $t_quiz AS quiz WHERE quiz.c_id = ".$courseInfo['real_id']." AND active IN (0, 1) @@ -1128,7 +1128,7 @@ if (!empty($studentId)) { $i = 0; if (Database:: num_rows($result_exercices) > 0) { while ($exercices = Database:: fetch_array($result_exercices)) { - $exercise_id = intval($exercices['id']); + $exercise_id = intval($exercices['iid']); $count_attempts = Tracking::count_student_exercise_attempts( $studentId, $courseInfo['real_id'], @@ -2231,7 +2231,7 @@ if (empty($_GET['details'])) { ]; $t_quiz = Database:: get_course_table(TABLE_QUIZ_TEST); - $sql = "SELECT quiz.title, id FROM ".$t_quiz." AS quiz + $sql = "SELECT quiz.title, iid FROM ".$t_quiz." AS quiz WHERE quiz.c_id = $c_id AND (quiz.session_id = $session_id OR quiz.session_id = 0) AND @@ -2241,7 +2241,7 @@ if (empty($_GET['details'])) { $i = 0; if (Database:: num_rows($result_exercices) > 0) { while ($exercices = Database:: fetch_array($result_exercices)) { - $exercise_id = intval($exercices['id']); + $exercise_id = intval($exercices['iid']); $count_attempts = Tracking::count_student_exercise_attempts( $studentId, $course_code, diff --git a/main/gradebook/gradebook_edit_all.php b/main/gradebook/gradebook_edit_all.php index c03f4bbcba..c9a6c4e5b0 100755 --- a/main/gradebook/gradebook_edit_all.php +++ b/main/gradebook/gradebook_edit_all.php @@ -44,7 +44,7 @@ $tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE); $table_evaluated[LINK_EXERCISE] = [ TABLE_QUIZ_TEST, 'title', - 'id', + 'iid', get_lang('Exercise'), ]; $table_evaluated[LINK_DROPBOX] = [ diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index 340ab4db68..6ccb8ba70c 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -69,7 +69,7 @@ class ExerciseLink extends AbstractLink $sqlLp = "SELECT e.iid, e.title, lp.name lp_name FROM $exerciseTable e INNER JOIN $lpItemTable i - ON (e.c_id = i.c_id AND e.id = i.path) + ON (e.c_id = i.c_id AND e.iid = i.path) INNER JOIN $lpTable lp ON (lp.c_id = e.c_id AND lp.id = i.lp_id) WHERE @@ -640,7 +640,6 @@ class ExerciseLink extends AbstractLink // Try with iid $sql = 'SELECT * FROM '.$table.' WHERE - c_id = '.$this->course_id.' AND iid = '.$exerciseId; $result = Database::query($sql); $rows = Database::num_rows($result); @@ -651,8 +650,7 @@ class ExerciseLink extends AbstractLink // Try wit id $sql = 'SELECT * FROM '.$table.' WHERE - c_id = '.$this->course_id.' AND - id = '.$exerciseId; + iid = '.$exerciseId; $result = Database::query($sql); $this->exercise_data = Database::fetch_array($result); } diff --git a/main/inc/ajax/course.ajax.php b/main/inc/ajax/course.ajax.php index 7b995eab6d..a814f57adf 100755 --- a/main/inc/ajax/course.ajax.php +++ b/main/inc/ajax/course.ajax.php @@ -323,7 +323,7 @@ switch ($action) { ); foreach ($exercises as $exercise) { - $data[] = ['id' => $exercise['id'], 'text' => html_entity_decode($exercise['title'])]; + $data[] = ['id' => $exercise['iid'], 'text' => html_entity_decode($exercise['title'])]; } if (!empty($data)) { $data[] = ['id' => 'T', 'text' => 'TODOS']; diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index 8aaf248a6f..92f56e5d64 100755 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -34,7 +34,7 @@ switch ($action) { if (!empty($results)) { foreach ($results as $exercise) { - $data[] = ['id' => $exercise['id'], 'text' => html_entity_decode($exercise['title'])]; + $data[] = ['id' => $exercise['iid'], 'text' => html_entity_decode($exercise['title'])]; } } diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index 455a6d981b..1ab346cc2e 100755 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -2492,7 +2492,7 @@ switch ($action) { $quizIds = []; if (!empty($exercises)) { foreach ($exercises as $exercise) { - $quizIds[] = $exercise['id']; + $quizIds[] = $exercise['iid']; } } diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php index ce5eb4738b..92571a4b70 100644 --- a/main/inc/lib/exercise.lib.php +++ b/main/inc/lib/exercise.lib.php @@ -1761,7 +1761,7 @@ HOTSPOT; $sql = " SELECT q.*, tee.* FROM $quizTable as q INNER JOIN $trackExerciseTable as tee - ON q.id = tee.exe_exo_id + ON q.iid = tee.exe_exo_id INNER JOIN $courseTable c ON c.id = tee.c_id WHERE tee.exe_id = $exeId @@ -1799,7 +1799,7 @@ HOTSPOT; $exercise_id = (int) $exercise_id; $table = Database::get_course_table(TABLE_QUIZ_TEST); $sql = "SELECT expired_time FROM $table - WHERE c_id = $course_id AND id = $exercise_id"; + WHERE iid = $exercise_id"; $result = Database::query($sql); $row = Database::fetch_array($result, 'ASSOC'); if (!empty($row['expired_time'])) { @@ -2372,7 +2372,7 @@ HOTSPOT; $sql = " $sql_select FROM $TBL_EXERCICES AS ce INNER JOIN $sql_inner_join_tbl_track_exercices AS te - ON (te.exe_exo_id = ce.id) + ON (te.exe_exo_id = ce.iid) INNER JOIN $sql_inner_join_tbl_user AS user ON (user.user_id = exe_user_id) WHERE diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 50f9035725..6b2b104398 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -388,8 +388,7 @@ class Tracking $sql = "SELECT results_disabled FROM $TBL_QUIZ WHERE - c_id = $course_id AND - id ='".$my_path."'"; + iid ='".$my_path."'"; $res_result_disabled = Database::query($sql); $row_result_disabled = Database::fetch_row($res_result_disabled); @@ -694,7 +693,7 @@ class Tracking $my_path = Database::escape_string($my_path); $sql = "SELECT results_disabled FROM $TBL_QUIZ - WHERE c_id = $course_id AND id = '$my_path' "; + WHERE iid = '$my_path' "; $res_result_disabled = Database::query($sql); $row_result_disabled = Database::fetch_row($res_result_disabled); @@ -818,7 +817,7 @@ class Tracking question_id, marks, ponderation FROM $tbl_stats_attempts as at INNER JOIN $tbl_quiz_questions as q - ON (q.id = at.question_id AND q.c_id = $course_id) + ON q.iid = at.question_id WHERE exe_id ='$id_last_attempt' ) as t"; @@ -2305,7 +2304,7 @@ class Tracking $select_lp_id = ', orig_lp_id as lp_id '; } - $sql = "SELECT count(id) + $sql = "SELECT count(iid) FROM $tbl_course_quiz WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz "; $count_quiz = 0; @@ -2324,14 +2323,14 @@ class Tracking } if (empty($exercise_id)) { - $sql = "SELECT id FROM $tbl_course_quiz + $sql = "SELECT iid FROM $tbl_course_quiz WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz"; $result = Database::query($sql); $exercise_list = []; $exercise_id = null; if (!empty($result) && Database::num_rows($result)) { while ($row = Database::fetch_array($result)) { - $exercise_list[] = $row['id']; + $exercise_list[] = $row['iid']; } } if (!empty($exercise_list)) { @@ -2531,7 +2530,7 @@ class Tracking $result = 0; if (!empty($exercise_list)) { foreach ($exercise_list as $exercise_data) { - $exercise_id = $exercise_data['id']; + $exercise_id = $exercise_data['iid']; $best_attempt = Event::get_best_attempt_exercise_results_per_user( $user_id, $exercise_id, @@ -3006,10 +3005,10 @@ class Tracking ponderation FROM $tbl_stats_attempts AS at INNER JOIN $tbl_quiz_questions AS q - ON (q.id = at.question_id AND q.c_id = q.c_id) + ON q.iid = at.question_id WHERE exe_id ='$id_last_attempt' AND - q.c_id = $course_id + at.c_id = $course_id ) AS t"; @@ -4921,7 +4920,7 @@ class Tracking if (!empty($exerciseList)) { foreach ($exerciseList as $exerciseData) { $results = Event::get_best_exercise_results_by_user( - $exerciseData['id'], + $exerciseData['iid'], $courseInfo['real_id'], 0, $user_id @@ -5030,13 +5029,13 @@ class Tracking foreach ($exercise_list as $exercise_data) { $exercise_obj = new Exercise($course_data['real_id']); - $exercise_obj->read($exercise_data['id']); + $exercise_obj->read($exercise_data['iid']); // Exercise is not necessary to be visible to show results check the result_disable configuration instead //$visible_return = $exercise_obj->is_visible(); if ($exercise_data['results_disabled'] == 0 || $exercise_data['results_disabled'] == 2) { $best_average = (int) ExerciseLib::get_best_average_score_by_exercise( - $exercise_data['id'], + $exercise_data['iid'], $course_data['real_id'], $my_session_id, $user_count @@ -5048,7 +5047,7 @@ class Tracking $user_result_data = ExerciseLib::get_best_attempt_by_user( api_get_user_id(), - $exercise_data['id'], + $exercise_data['iid'], $course_data['real_id'], $my_session_id ); @@ -5154,7 +5153,7 @@ class Tracking foreach ($exercises as $exercise_item) { $attempts = Event::count_exercise_attempts_by_user( api_get_user_id(), - $exercise_item['id'], + $exercise_item['iid'], $courseInfo['real_id'], $my_session_id ); @@ -5267,7 +5266,7 @@ class Tracking foreach ($exercises as $exercise_item) { $attempts = Event::count_exercise_attempts_by_user( api_get_user_id(), - $exercise_item['id'], + $exercise_item['iid'], $courseId, $session_id_from_get ); @@ -6084,16 +6083,16 @@ class Tracking ta.answer as answer_id, ta.tms as time, te.exe_exo_id as quiz_id, - CONCAT ('c', q.c_id, '_e', q.id) as exercise_id, + CONCAT ('c', q.c_id, '_e', q.iid) as exercise_id, q.title as quiz_title, qq.description as description FROM $ttrack_exercises te INNER JOIN $ttrack_attempt ta ON ta.exe_id = te.exe_id INNER JOIN $tquiz q - ON q.id = te.exe_exo_id + ON q.iid = te.exe_exo_id INNER JOIN $tquiz_rel_question rq - ON rq.exercice_id = q.id AND rq.c_id = q.c_id + ON rq.exercice_id = q.iid AND rq.c_id = q.c_id INNER JOIN $tquiz_question qq ON qq.id = rq.question_id AND @@ -6122,12 +6121,11 @@ class Tracking } } // 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, + $sqlQuestions = "SELECT tq.c_id, tq.iid as question_id, tq.question, tqa.id_auto, tqa.answer, tqa.correct, tq.position, tqa.id_auto as answer_id FROM $tquiz_question tq, $tquiz_answer tqa WHERE - tqa.question_id = tq.id AND - tqa.c_id = tq.c_id AND + tqa.question_id = tq.iid AND tq.c_id = $courseIdx AND tq.id IN (".implode(',', $questionIds).")"; @@ -7352,20 +7350,20 @@ class Tracking foreach ($exerciseList as $exercices) { $objExercise = new Exercise($courseInfo['real_id']); - $objExercise->read($exercices['id']); + $objExercise->read($exercices['iid']); $visibleReturn = $objExercise->is_visible(); // Getting count of attempts by user $attempts = Event::count_exercise_attempts_by_user( api_get_user_id(), - $exercices['id'], + $exercices['iid'], $courseInfo['real_id'], $sessionId ); $url = $webCodePath.'exercise/overview.php?' .http_build_query( - ['cidReq' => $courseInfo['code'], 'id_session' => $sessionId, 'exerciseId' => $exercices['id']] + ['cidReq' => $courseInfo['code'], 'id_session' => $sessionId, 'exerciseId' => $exercices['iid']] ); if ($visibleReturn['value'] == true) { @@ -7398,19 +7396,19 @@ class Tracking //For graphics $bestExerciseAttempts = Event::get_best_exercise_results_by_user( - $exercices['id'], + $exercices['iid'], $courseInfo['real_id'], $sessionId ); - $toGraphExerciseResult[$exercices['id']] = [ + $toGraphExerciseResult[$exercices['iid']] = [ 'title' => $exercices['title'], 'data' => $bestExerciseAttempts, ]; // Getting best results $bestScoreData = ExerciseLib::get_best_attempt_in_course( - $exercices['id'], + $exercices['iid'], $courseInfo['real_id'], $sessionId ); @@ -7424,7 +7422,7 @@ class Tracking $exerciseAttempt = ExerciseLib::get_best_attempt_by_user( api_get_user_id(), - $exercices['id'], + $exercices['iid'], $courseInfo['real_id'], $sessionId ); @@ -7460,18 +7458,18 @@ class Tracking $quizData[4] = ExerciseLib::get_exercise_result_ranking( $myScore, $exeId, - $exercices['id'], + $exercices['iid'], $courseInfo['code'], $sessionId, $userList ); - $graph = self::generate_exercise_result_thumbnail_graph($toGraphExerciseResult[$exercices['id']]); - $normalGraph = self::generate_exercise_result_graph($toGraphExerciseResult[$exercices['id']]); + $graph = self::generate_exercise_result_thumbnail_graph($toGraphExerciseResult[$exercices['iid']]); + $normalGraph = self::generate_exercise_result_graph($toGraphExerciseResult[$exercices['iid']]); $quizData[6] = Display::url( Display::img($graph, '', [], false), $normalGraph, - ['id' => $exercices['id'], 'class' => 'expand-image'] + ['id' => $exercices['iid'], 'class' => 'expand-image'] ); } @@ -8018,7 +8016,7 @@ class TrackingCourseLog case 'quiz': $table_name = TABLE_QUIZ_TEST; $link_tool = 'exercise/exercise.php'; - $id_tool = 'id'; + $id_tool = 'iid'; break; case 'glossary': $table_name = TABLE_GLOSSARY; diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php index 490b3de0e6..666164f64e 100755 --- a/main/lp/learnpath.class.php +++ b/main/lp/learnpath.class.php @@ -7688,7 +7688,7 @@ class learnpath } elseif (is_numeric($extra_info)) { $sql = "SELECT title, description FROM $tbl_quiz - WHERE c_id = $course_id AND iid = ".$extra_info; + WHERE iid = ".$extra_info; $result = Database::query($sql); $row = Database::fetch_array($result); @@ -10623,10 +10623,10 @@ class learnpath $link = Display::url( $previewIcon, - $exerciseUrl.'&exerciseId='.$row_quiz['id'], + $exerciseUrl.'&exerciseId='.$row_quiz['iid'], ['target' => '_blank'] ); - $return .= '
  • '; + $return .= '
  • '; $return .= Display::url($moveIcon, '#', ['class' => 'moved']); $return .= $quizIcon; $sessionStar = api_get_session_image( @@ -10635,7 +10635,7 @@ class learnpath ); $return .= Display::url( Security::remove_XSS(cut($title, 80)).$link.$sessionStar, - api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_QUIZ.'&file='.$row_quiz['id'].'&lp_id='.$this->lp_id, + api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_QUIZ.'&file='.$row_quiz['iid'].'&lp_id='.$this->lp_id, [ 'class' => $visibility == 0 ? 'moved text-muted' : 'moved', ] @@ -13570,7 +13570,7 @@ EOD; break; case TOOL_QUIZ: $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST); - $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id = $id"); + $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE iid = $id"); $myrow = Database::fetch_array($result); $output = $myrow['title']; break; diff --git a/main/mySpace/exercise_category_report.php b/main/mySpace/exercise_category_report.php index 35e88fab41..4eba7c9cba 100644 --- a/main/mySpace/exercise_category_report.php +++ b/main/mySpace/exercise_category_report.php @@ -28,12 +28,12 @@ $defaults['course_id'] = $courseId; $htmlHeadXtra[] = api_get_jqgrid_js(); $htmlHeadXtra[] = '