|
|
|
|
@ -19,7 +19,6 @@ require_once __DIR__.'/../inc/global.inc.php'; |
|
|
|
|
api_protect_course_script(true); |
|
|
|
|
|
|
|
|
|
$this_section = SECTION_COURSES; |
|
|
|
|
|
|
|
|
|
$is_allowedToEdit = api_is_allowed_to_edit(null, true); |
|
|
|
|
|
|
|
|
|
$delete = isset($_GET['delete']) ? (int) $_GET['delete'] : null; |
|
|
|
|
@ -56,7 +55,7 @@ $interbreadcrumb[] = ['url' => 'exercise.php?'.api_get_cidreq(), 'name' => get_l |
|
|
|
|
|
|
|
|
|
if (!empty($objExercise->id)) { |
|
|
|
|
$interbreadcrumb[] = [ |
|
|
|
|
'url' => 'admin.php?exerciseId='.$objExercise->id.'&'.api_get_cidreq(), |
|
|
|
|
'url' => 'admin.php?id='.$objExercise->id.'&'.api_get_cidreq(), |
|
|
|
|
'name' => $objExercise->selectTitle(true), |
|
|
|
|
]; |
|
|
|
|
} |
|
|
|
|
@ -306,7 +305,7 @@ if (isset($fromExercise) && $fromExercise > 0) { |
|
|
|
|
} else { |
|
|
|
|
echo '<a href="exercise.php?'.api_get_cidreq().'">'. |
|
|
|
|
Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
|
|
|
echo "<a href='admin.php?exerciseId=0'>". |
|
|
|
|
echo "<a href='admin.php?id=0'>". |
|
|
|
|
Display::return_icon('add_question.gif', get_lang('New question'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
|
|
|
$titleAdd = get_lang('Manage all questions'); |
|
|
|
|
} |
|
|
|
|
@ -408,16 +407,16 @@ $my_exercise_list['-1'] = get_lang('Orphan questions'); |
|
|
|
|
$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; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -635,7 +634,7 @@ function getQuestions( |
|
|
|
|
if (!empty($fromExercise)) { |
|
|
|
|
$currentCourseId = api_get_course_int_id(); |
|
|
|
|
$currentExerciseCondition = " |
|
|
|
|
AND qu.id NOT IN ( |
|
|
|
|
AND qu.iid NOT IN ( |
|
|
|
|
SELECT question_id FROM $TBL_EXERCISE_QUESTION |
|
|
|
|
WHERE exercice_id = $fromExercise AND c_id = $currentCourseId |
|
|
|
|
)"; |
|
|
|
|
@ -651,7 +650,7 @@ function getQuestions( |
|
|
|
|
$from = ", $TBL_COURSE_REL_CATEGORY crc "; |
|
|
|
|
$where .= " AND |
|
|
|
|
crc.c_id = $selected_course AND |
|
|
|
|
crc.question_id = qu.id AND |
|
|
|
|
crc.question_id = qu.iid AND |
|
|
|
|
crc.category_id = $courseCategoryId"; |
|
|
|
|
} |
|
|
|
|
if (isset($exerciseLevel) && -1 != $exerciseLevel) { |
|
|
|
|
@ -670,7 +669,7 @@ function getQuestions( |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$select = 'DISTINCT |
|
|
|
|
id, |
|
|
|
|
iid, |
|
|
|
|
question, |
|
|
|
|
type, |
|
|
|
|
level, |
|
|
|
|
@ -680,9 +679,9 @@ function getQuestions( |
|
|
|
|
} |
|
|
|
|
$sql = "SELECT $select |
|
|
|
|
FROM |
|
|
|
|
$TBL_EXERCISE_QUESTION qt |
|
|
|
|
INNER JOIN $TBL_QUESTIONS qu |
|
|
|
|
ON qt.question_id = qu.id |
|
|
|
|
$TBL_EXERCISE_QUESTION qt |
|
|
|
|
INNER JOIN $TBL_QUESTIONS qu |
|
|
|
|
ON qt.question_id = qu.iid |
|
|
|
|
$from |
|
|
|
|
{$efConditions['from']} |
|
|
|
|
WHERE |
|
|
|
|
@ -701,7 +700,7 @@ function getQuestions( |
|
|
|
|
$from = ''; |
|
|
|
|
if (isset($courseCategoryId) && $courseCategoryId > 0) { |
|
|
|
|
$from = " INNER JOIN $TBL_COURSE_REL_CATEGORY crc |
|
|
|
|
ON crc.question_id = q.id AND crc.c_id = q.c_id "; |
|
|
|
|
ON crc.question_id = q.iid AND crc.c_id = q.c_id "; |
|
|
|
|
$level_where .= " AND |
|
|
|
|
crc.c_id = $selected_course AND |
|
|
|
|
crc.category_id = $courseCategoryId"; |
|
|
|
|
@ -732,7 +731,7 @@ function getQuestions( |
|
|
|
|
SELECT $select |
|
|
|
|
FROM $TBL_QUESTIONS qu |
|
|
|
|
INNER JOIN $TBL_EXERCISE_QUESTION r |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.id = r.question_id) |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.iid = r.question_id) |
|
|
|
|
INNER JOIN $TBL_EXERCISES ex |
|
|
|
|
ON (ex.id = r.exercice_id AND ex.c_id = r.c_id) |
|
|
|
|
$from |
|
|
|
|
@ -749,7 +748,7 @@ function getQuestions( |
|
|
|
|
SELECT $select |
|
|
|
|
FROM $TBL_QUESTIONS qu |
|
|
|
|
LEFT OUTER JOIN $TBL_EXERCISE_QUESTION r |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.id = r.question_id) |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.iid = r.question_id) |
|
|
|
|
$from |
|
|
|
|
{$efConditions['from']} |
|
|
|
|
WHERE |
|
|
|
|
@ -764,7 +763,7 @@ function getQuestions( |
|
|
|
|
SELECT $select |
|
|
|
|
FROM $TBL_QUESTIONS qu |
|
|
|
|
INNER JOIN $TBL_EXERCISE_QUESTION r |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.id = r.question_id) |
|
|
|
|
ON (qu.c_id = r.c_id AND qu.iid = r.question_id) |
|
|
|
|
$from |
|
|
|
|
{$efConditions['from']} |
|
|
|
|
WHERE |
|
|
|
|
@ -788,7 +787,7 @@ function getQuestions( |
|
|
|
|
$from = ", $TBL_COURSE_REL_CATEGORY crc "; |
|
|
|
|
$filter .= " AND |
|
|
|
|
crc.c_id = $selected_course AND |
|
|
|
|
crc.question_id = qu.id AND |
|
|
|
|
crc.question_id = qu.iid AND |
|
|
|
|
crc.category_id = $courseCategoryId"; |
|
|
|
|
} |
|
|
|
|
if (isset($exerciseLevel) && -1 != $exerciseLevel) { |
|
|
|
|
@ -811,7 +810,7 @@ function getQuestions( |
|
|
|
|
} |
|
|
|
|
$sessionCondition = api_get_session_condition($session_id, true, 'q.session_id'); |
|
|
|
|
|
|
|
|
|
$select = 'qu.iid, qu.id, question, qu.type, level, q.session_id, qt.exercice_id exerciseId '; |
|
|
|
|
$select = 'qu.iid, question, qu.type, level, q.session_id, qt.exercice_id exerciseId '; |
|
|
|
|
if ($getCount) { |
|
|
|
|
$select = 'count(qu.iid) as count'; |
|
|
|
|
} |
|
|
|
|
@ -822,9 +821,9 @@ function getQuestions( |
|
|
|
|
FROM |
|
|
|
|
$TBL_QUESTIONS as qu |
|
|
|
|
INNER JOIN $TBL_EXERCISE_QUESTION as qt |
|
|
|
|
ON (qu.id = qt.question_id AND qu.c_id = qt.c_id) |
|
|
|
|
ON (qu.iid = 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 |
|
|
|
|
@ -980,19 +979,20 @@ if ($fromExercise <= 0) { |
|
|
|
|
$data = []; |
|
|
|
|
if (is_array($mainQuestionList)) { |
|
|
|
|
foreach ($mainQuestionList as $question) { |
|
|
|
|
$questionId = $question['iid']; |
|
|
|
|
$row = []; |
|
|
|
|
// This function checks if the question can be read |
|
|
|
|
$question_type = get_question_type_for_question($selected_course, $question['id']); |
|
|
|
|
$question_type = get_question_type_for_question($selected_course, $questionId); |
|
|
|
|
|
|
|
|
|
if (empty($question_type)) { |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
$sessionId = isset($question['session_id']) ? $question['session_id'] : null; |
|
|
|
|
if (!$objExercise->hasQuestion($question['id'])) { |
|
|
|
|
if (!$objExercise->hasQuestion($question['iid'])) { |
|
|
|
|
$row[] = Display::input( |
|
|
|
|
'checkbox', |
|
|
|
|
'questions[]', |
|
|
|
|
$question['id'], |
|
|
|
|
$questionId, |
|
|
|
|
['class' => 'question_checkbox'] |
|
|
|
|
); |
|
|
|
|
} else { |
|
|
|
|
@ -1002,7 +1002,7 @@ if (is_array($mainQuestionList)) { |
|
|
|
|
$row[] = getLinkForQuestion( |
|
|
|
|
$questionTagA, |
|
|
|
|
$fromExercise, |
|
|
|
|
$question['id'], |
|
|
|
|
$questionId, |
|
|
|
|
$question['type'], |
|
|
|
|
$question['question'], |
|
|
|
|
$sessionId, |
|
|
|
|
@ -1010,12 +1010,12 @@ if (is_array($mainQuestionList)) { |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$row[] = $question_type; |
|
|
|
|
$row[] = TestCategory::getCategoryNameForQuestion($question['id'], $selected_course); |
|
|
|
|
$row[] = TestCategory::getCategoryNameForQuestion($questionId, $selected_course); |
|
|
|
|
$row[] = $question['level']; |
|
|
|
|
$row[] = get_action_icon_for_question( |
|
|
|
|
$actionIcon1, |
|
|
|
|
$fromExercise, |
|
|
|
|
$question['id'], |
|
|
|
|
$questionId, |
|
|
|
|
$question['type'], |
|
|
|
|
$question['question'], |
|
|
|
|
$selected_course, |
|
|
|
|
@ -1029,7 +1029,7 @@ if (is_array($mainQuestionList)) { |
|
|
|
|
get_action_icon_for_question( |
|
|
|
|
$actionIcon2, |
|
|
|
|
$fromExercise, |
|
|
|
|
$question['id'], |
|
|
|
|
$questionId, |
|
|
|
|
$question['type'], |
|
|
|
|
$question['question'], |
|
|
|
|
$selected_course, |
|
|
|
|
@ -1045,12 +1045,12 @@ if (is_array($mainQuestionList)) { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$headers = [ |
|
|
|
|
'', |
|
|
|
|
get_lang('QuestionUpperCaseFirstLetter'), |
|
|
|
|
get_lang('Type'), |
|
|
|
|
'', |
|
|
|
|
get_lang('Question'), |
|
|
|
|
get_lang('Type'), |
|
|
|
|
get_lang('QuestionCategory'), |
|
|
|
|
get_lang('Difficulty'), |
|
|
|
|
$actionLabel, |
|
|
|
|
get_lang('Difficulty'), |
|
|
|
|
$actionLabel, |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
echo $pagination; |
|
|
|
|
@ -1080,7 +1080,7 @@ foreach ($data as $rows) { |
|
|
|
|
$row, |
|
|
|
|
$column, |
|
|
|
|
$value |
|
|
|
|
); |
|
|
|
|
); |
|
|
|
|
$column++; |
|
|
|
|
} |
|
|
|
|
$row++; |
|
|
|
|
|
Julio Montoya
5 years ago