chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Admin: Add config "show_exercise_session_attempts_in_base_course"

Browse Source 
Shows exercise session attempts in the base course. BT#18351
pull/3766/head^2
Julio Montoya 5 years ago
parent fdee226d18
commit a6a7a3fd37
4 changed files with 50 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/exercise/exercise_result.class.php
  2. 7
      main/inc/ajax/model.ajax.php
  3. 72
      main/inc/lib/exercise.lib.php
  4. 3
      main/install/configuration.dist.php

6
main/exercise/exercise_result.class.php
Unescape View File

@ -60,6 +60,12 @@ class ExerciseResult
$session_id_and = ' AND te.session_id = '.$sessionId.' '; $session_id_and = ' AND te.session_id = '.$sessionId.' ';
$exercise_id = (int) $exercise_id; $exercise_id = (int) $exercise_id;
if (empty($sessionId) &&
api_get_configuration_value('show_exercise_session_attempts_in_base_course')
) {
$session_id_and = '';
}
if (!empty($exercise_id)) { if (!empty($exercise_id)) {
$session_id_and .= " AND exe_exo_id = $exercise_id "; $session_id_and .= " AND exe_exo_id = $exercise_id ";
} }

7
main/inc/ajax/model.ajax.php
Unescape View File

@ -642,10 +642,7 @@ switch ($action) {
$whereCondition = " AND $whereCondition"; $whereCondition = " AND $whereCondition";
} }
$count = ExerciseLib::get_count_exam_results( $count = ExerciseLib::get_count_exam_results($exercise_id, $whereCondition);
$exercise_id,
$whereCondition
);
break; break;
case 'get_exercise_results_report': case 'get_exercise_results_report':
api_protect_admin_script(); api_protect_admin_script();
@ -1539,7 +1536,7 @@ switch ($action) {
if (!empty($categoryList)) { if (!empty($categoryList)) {
foreach ($categoryList as $categoryInfo) { foreach ($categoryList as $categoryInfo) {
$label = 'category_'.$categoryInfo['id']; $label = 'category_'.$categoryInfo['id'];
if ($operation == 'excel') { if ($operation === 'excel') {
$columns[] = $label.'_score_percentage'; $columns[] = $label.'_score_percentage';
$columns[] = $label.'_only_score'; $columns[] = $label.'_only_score';
$columns[] = $label.'_total'; $columns[] = $label.'_total';

72
main/inc/lib/exercise.lib.php
Unescape View File

@ -1914,7 +1914,7 @@ HOTSPOT;
*/ */
public static function get_count_exam_results($exerciseId, $conditions, $courseCode = '', $showSession = false) public static function get_count_exam_results($exerciseId, $conditions, $courseCode = '', $showSession = false)
{ {
$count = self::get_exam_results_data( return self::get_exam_results_data(
null, null,
null, null,
null, null,
@ -1925,8 +1925,6 @@ HOTSPOT;
$courseCode, $courseCode,
$showSession $showSession
); );
return $count;
} }
/** /**
@ -2072,7 +2070,7 @@ HOTSPOT;
} }
/** /**
* Gets the exam'data results. * Gets exercise results.
* *
* @todo this function should be moved in a library + no global calls * @todo this function should be moved in a library + no global calls
* *
@ -2119,7 +2117,6 @@ HOTSPOT;
} }
$documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'; $documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
$course_id = $courseInfo['real_id']; $course_id = $courseInfo['real_id'];
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$exercise_id = (int) $exercise_id; $exercise_id = (int) $exercise_id;
@ -2145,9 +2142,16 @@ HOTSPOT;
$sessionCondition = " AND ttte.session_id = $sessionId"; $sessionCondition = " AND ttte.session_id = $sessionId";
} }
if (empty($sessionId) &&
api_get_configuration_value('show_exercise_session_attempts_in_base_course')
) {
$session_id_and = '';
$sessionCondition = '';
}
$exercise_where = ''; $exercise_where = '';
if (!empty($exercise_id)) { if (!empty($exercise_id)) {
$exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.' '; $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.' ';
} }
$hotpotatoe_where = ''; $hotpotatoe_where = '';
@ -2407,20 +2411,19 @@ HOTSPOT;
if (is_array($results)) { if (is_array($results)) {
$users_array_id = []; $users_array_id = [];
$from_gradebook = false; $from_gradebook = false;
if (isset($_GET['gradebook']) && $_GET['gradebook'] == 'view') { if (isset($_GET['gradebook']) && $_GET['gradebook'] === 'view') {
$from_gradebook = true; $from_gradebook = true;
} }
$sizeof = count($results); $sizeof = count($results);
$locked = api_resource_is_locked_by_gradebook( $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
$exercise_id,
LINK_EXERCISE
);
$timeNow = strtotime(api_get_utc_datetime()); $timeNow = strtotime(api_get_utc_datetime());
// Looping results // Looping results
for ($i = 0; $i < $sizeof; $i++) { for ($i = 0; $i < $sizeof; $i++) {
$revised = $results[$i]['revised']; $revised = $results[$i]['revised'];
if ($results[$i]['completion_status'] == 'incomplete') { $attemptSessionId = (int) $results[$i]['session_id'];
$cidReq = api_get_cidreq(false).'&id_session='.$attemptSessionId;
if ('incomplete' === $results[$i]['completion_status']) {
// If the exercise was incomplete, we need to determine // If the exercise was incomplete, we need to determine
// if it is still into the time allowed, or if its // if it is still into the time allowed, or if its
// allowed time has expired and it can be closed // allowed time has expired and it can be closed
@ -2454,17 +2457,20 @@ HOTSPOT;
$users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname']; $users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'];
} }
$lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null; $lp_obj = isset($results[$i]['orig_lp_id']) &&
isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null;
if (empty($lp_obj)) { if (empty($lp_obj)) {
// Try to get the old id (id instead of iid) // Try to get the old id (id instead of iid)
$lpNewId = isset($results[$i]['orig_lp_id']) && isset($oldIds[$results[$i]['orig_lp_id']]) ? $oldIds[$results[$i]['orig_lp_id']] : null; $lpNewId = isset($results[$i]['orig_lp_id']) &&
isset($oldIds[$results[$i]['orig_lp_id']]) ? $oldIds[$results[$i]['orig_lp_id']] : null;
if ($lpNewId) { if ($lpNewId) {
$lp_obj = isset($lp_list[$lpNewId]) ? $lp_list[$lpNewId] : null; $lp_obj = isset($lp_list[$lpNewId]) ? $lp_list[$lpNewId] : null;
} }
} }
$lp_name = null; $lp_name = null;
if ($lp_obj) { if ($lp_obj) {
$url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$results[$i]['orig_lp_id']; $url = api_get_path(WEB_CODE_PATH).
'lp/lp_controller.php?'.$cidReq.'&action=view&lp_id='.$results[$i]['orig_lp_id'];
$lp_name = Display::url( $lp_name = Display::url(
$lp_obj['lp_name'], $lp_obj['lp_name'],
$url, $url,
@ -2532,7 +2538,7 @@ HOTSPOT;
$revisedLabel = ''; $revisedLabel = '';
switch ($revised) { switch ($revised) {
case 0: case 0:
$actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=qualify&id=$id'>". $actions .= "<a href='exercise_show.php?".$cidReq."&action=qualify&id=$id'>".
Display:: return_icon( Display:: return_icon(
'quiz.png', 'quiz.png',
get_lang('Qualify') get_lang('Qualify')
@ -2544,7 +2550,7 @@ HOTSPOT;
); );
break; break;
case 1: case 1:
$actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=edit&id=$id'>". $actions .= "<a href='exercise_show.php?".$cidReq."&action=edit&id=$id'>".
Display:: return_icon( Display:: return_icon(
'edit.png', 'edit.png',
get_lang('Edit'), get_lang('Edit'),
@ -2559,11 +2565,9 @@ HOTSPOT;
break; break;
case 2: //finished but not marked as such case 2: //finished but not marked as such
$actions .= '<a href="exercise_report.php?' $actions .= '<a href="exercise_report.php?'
.api_get_cidreq() .$cidReq
.'&exerciseId=' .'&exerciseId='.$exercise_id
.$exercise_id .'&a=close&id='.$id
.'&a=close&id='
.$id
.'">'. .'">'.
Display:: return_icon( Display:: return_icon(
'lock.png', 'lock.png',
@ -2593,7 +2597,7 @@ HOTSPOT;
} }
if ($filter == 2) { if ($filter == 2) {
$actions .= ' <a href="exercise_history.php?'.api_get_cidreq().'&exe_id='.$id.'">'. $actions .= ' <a href="exercise_history.php?'.$cidReq.'&exe_id='.$id.'">'.
Display:: return_icon( Display:: return_icon(
'history.png', 'history.png',
get_lang('ViewHistoryChange') get_lang('ViewHistoryChange')
@ -2612,7 +2616,7 @@ HOTSPOT;
.'</a>'; .'</a>';
$recalculateUrl = api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'. $recalculateUrl = api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'.
api_get_cidreq().'&'. $cidReq.'&'.
http_build_query([ http_build_query([
'id' => $id, 'id' => $id,
'exercise' => $exercise_id, 'exercise' => $exercise_id,
@ -2630,8 +2634,9 @@ HOTSPOT;
); );
$filterByUser = isset($_GET['filter_by_user']) ? (int) $_GET['filter_by_user'] : 0; $filterByUser = isset($_GET['filter_by_user']) ? (int) $_GET['filter_by_user'] : 0;
$delete_link = '<a href="exercise_report.php?'.api_get_cidreq().'&filter_by_user='.$filterByUser.'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'" $delete_link = '<a
onclick="javascript:if(!confirm(\''.sprintf( href="exercise_report.php?'.$cidReq.'&filter_by_user='.$filterByUser.'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'"
onclick="javascript:if(!confirm(\''.sprintf(
addslashes(get_lang('DeleteAttempt')), addslashes(get_lang('DeleteAttempt')),
$results[$i]['username'], $results[$i]['username'],
$dt $dt
@ -2653,7 +2658,7 @@ HOTSPOT;
$actions .= $delete_link; $actions .= $delete_link;
} }
} else { } else {
$attempt_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId; $attempt_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?'.$cidReq.'&id='.$results[$i]['exe_id'];
$attempt_link = Display::url( $attempt_link = Display::url(
get_lang('Show'), get_lang('Show'),
$attempt_url, $attempt_url,
@ -2685,8 +2690,8 @@ HOTSPOT;
if ($is_allowedToEdit) { if ($is_allowedToEdit) {
$sessionName = ''; $sessionName = '';
$sessionStartAccessDate = ''; $sessionStartAccessDate = '';
if (!empty($results[$i]['session_id'])) { if (!empty($attemptSessionId)) {
$sessionInfo = api_get_session_info($results[$i]['session_id']); $sessionInfo = api_get_session_info($attemptSessionId);
if (!empty($sessionInfo)) { if (!empty($sessionInfo)) {
$sessionName = $sessionInfo['name']; $sessionName = $sessionInfo['name'];
$sessionStartAccessDate = api_get_local_time($sessionInfo['access_start_date']); $sessionStartAccessDate = api_get_local_time($sessionInfo['access_start_date']);
@ -2702,7 +2707,8 @@ HOTSPOT;
if (!empty($question_list)) { if (!empty($question_list)) {
foreach ($question_list as $questionId) { foreach ($question_list as $questionId) {
$objQuestionTmp = Question::read($questionId, $objExercise->course); $objQuestionTmp = Question::read($questionId, $objExercise->course);
// We're inside *one* question. Go through each possible answer for this question // We're inside *one* question.
// Go through each possible answer for this question.
$result = $objExercise->manage_answer( $result = $objExercise->manage_answer(
$exeId, $exeId,
$questionId, $questionId,
@ -2779,8 +2785,8 @@ HOTSPOT;
$result['total'], $result['total'],
true, true,
true, true,
true, // $show_only_percentage = false true,
true, // hide % sign true,
$decimalSeparator, $decimalSeparator,
$thousandSeparator, $thousandSeparator,
$roundValues $roundValues

3
main/install/configuration.dist.php
Unescape View File

@ -1830,6 +1830,9 @@ ALTER TABLE gradebook_comment ADD CONSTRAINT FK_C3B70763AD3ED51C FOREIGN KEY (gr
// Custom cloud link URLS, this requires enable_add_file_link = true // Custom cloud link URLS, this requires enable_add_file_link = true
// $_configuration['documents_custom_cloud_link_list'] = ['links' => ['example.com', 'example2.com']]; // $_configuration['documents_custom_cloud_link_list'] = ['links' => ['example.com', 'example2.com']];
// Shows exercise session attempts in the base course.
// $_configuration['show_exercise_session_attempts_in_base_course'] = false;
// KEEP THIS AT THE END // KEEP THIS AT THE END
// -------- Custom DB changes // -------- Custom DB changes
// Add user activation by confirmation email // Add user activation by confirmation email

Write Preview
Loading…
Cancel
Save