|
@@ -26,7 +26,7 @@ $this_section = SECTION_COURSES;
|
|
|
$htmlHeadXtra[] = api_get_jqgrid_js();
|
|
|
|
|
|
if (empty($_GET['session_id'])) {
|
|
|
- api_not_allowed();
|
|
|
+ api_not_allowed();
|
|
|
}
|
|
|
|
|
|
$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']): null;
|
|
@@ -36,7 +36,7 @@ $_SESSION['id_session'] = $session_id;
|
|
|
|
|
|
// Clear the exercise session just in case
|
|
|
if (isset ($_SESSION['objExercise'])) {
|
|
|
- Session::erase('objExercise');
|
|
|
+ Session::erase('objExercise');
|
|
|
}
|
|
|
|
|
|
$session_info = SessionManager::fetch($session_id);
|
|
@@ -56,65 +56,84 @@ $final_array = array();
|
|
|
|
|
|
if (!empty($new_session_list)) {
|
|
|
foreach ($new_session_list as $item) {
|
|
|
- $my_session_id = isset($item['id_session']) ? $item['id_session'] : null;
|
|
|
+ $my_session_id = isset($item['id_session']) ? $item['id_session'] : null;
|
|
|
if (isset($my_session_id) && !in_array($my_session_id, $my_session_list) && $session_id == $my_session_id) {
|
|
|
- $final_array[$my_session_id]['name'] = $item['session_name'];
|
|
|
-
|
|
|
+ $final_array[$my_session_id]['name'] = $item['session_name'];
|
|
|
+
|
|
|
//Get all courses by session where I'm subscribed
|
|
|
$my_course_list = UserManager::get_courses_list_by_session(api_get_user_id(), $my_session_id);
|
|
|
-
|
|
|
+
|
|
|
foreach ($my_course_list as $my_course) {
|
|
|
$course = array();
|
|
|
-
|
|
|
+
|
|
|
$course_info = api_get_course_info($my_course['code']);
|
|
|
-
|
|
|
- //Getting all exercises from the current course
|
|
|
+
|
|
|
+ //Getting all exercises from the current course
|
|
|
$exercise_list = get_all_exercises($course_info, $my_session_id, true);
|
|
|
-
|
|
|
+
|
|
|
$course['name'] = $course_info['name'];
|
|
|
$course['id'] = $course_info['real_id'];
|
|
|
- if (!empty($exercise_list)) {
|
|
|
- foreach($exercise_list as $exercise_item) {
|
|
|
- //Loading the exercise
|
|
|
+ if (!empty($exercise_list)) {
|
|
|
+ foreach ($exercise_list as $exercise_item) {
|
|
|
+ //Loading the exercise
|
|
|
$exercise = new Exercise($course_info['real_id']);
|
|
|
- $exercise->read($exercise_item['id']);
|
|
|
+ $exercise->read($exercise_item['id']);
|
|
|
$visible_return = $exercise->is_visible();
|
|
|
- if ($visible_return['value'] != false) {
|
|
|
- //$exercise_course_list[$exercise_item['id']] = $exercise;
|
|
|
- //Reading all Exercise results by user, exercise_id, code, and session
|
|
|
- $user_results = get_exercise_results_by_user(api_get_user_id(), $exercise_item['id'], $my_course['code'], $my_session_id);
|
|
|
- $course['exercises'][$exercise_item['id']]['data']['exercise_data'] = $exercise;
|
|
|
+ if ($visible_return['value'] != false) {
|
|
|
+ // Reading all Exercise results by user, exercise_id, code, and session.
|
|
|
+ $user_results = get_exercise_results_by_user(
|
|
|
+ api_get_user_id(),
|
|
|
+ $exercise_item['id'],
|
|
|
+ $my_course['code'],
|
|
|
+ $my_session_id
|
|
|
+ );
|
|
|
+ $course['exercises'][$exercise_item['id']]['data']['exercise_data'] = $exercise;
|
|
|
$course['exercises'][$exercise_item['id']]['data']['results'] = $user_results;
|
|
|
}
|
|
|
}
|
|
|
- $final_array[$my_session_id]['data'][$my_course['code']] = $course;
|
|
|
- }
|
|
|
- }
|
|
|
+ $final_array[$my_session_id]['data'][$my_course['code']] = $course;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- $my_session_list[] = $my_session_id;
|
|
|
+ $my_session_list[] = $my_session_id;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-if (!empty($course_list)) {
|
|
|
+if (!empty($course_list)) {
|
|
|
foreach ($course_list as $course_data) {
|
|
|
if (in_array($course_data['code'], $user_course_list)) {
|
|
|
- $course_data['title'] = Display::url($course_data['title'], api_get_course_url($course_data['code'], $session_id));
|
|
|
+ $course_data['title'] = Display::url(
|
|
|
+ $course_data['title'],
|
|
|
+ api_get_course_url($course_data['code'], $session_id)
|
|
|
+ );
|
|
|
} else {
|
|
|
continue;
|
|
|
}
|
|
|
-
|
|
|
- $list = new LearnpathList(api_get_user_id(),$course_data['code'], $session_id, 'publicated_on ASC', true);
|
|
|
+
|
|
|
+ $list = new LearnpathList(
|
|
|
+ api_get_user_id(),
|
|
|
+ $course_data['code'],
|
|
|
+ $session_id,
|
|
|
+ 'publicated_on ASC',
|
|
|
+ true
|
|
|
+ );
|
|
|
$lp_list = $list->get_flat_list();
|
|
|
- $lp_count = count($lp_list);
|
|
|
+ $lp_count = count($lp_list);
|
|
|
$course_info = api_get_course_info($course_data['code']);
|
|
|
$exercise_count = count(get_all_exercises($course_info, $session_id, true));
|
|
|
-
|
|
|
+
|
|
|
$max_mutation_date = '';
|
|
|
-
|
|
|
- $last_date = Tracking::get_last_connection_date_on_the_course(api_get_user_id(), $course_data['code'], $session_id, false);
|
|
|
+
|
|
|
+ $last_date = Tracking::get_last_connection_date_on_the_course(
|
|
|
+ api_get_user_id(),
|
|
|
+ $course_data['code'],
|
|
|
+ $session_id,
|
|
|
+ false
|
|
|
+ );
|
|
|
+
|
|
|
$icons = '';
|
|
|
- foreach ($lp_list as $item) {
|
|
|
- if ($item['modified_on'] == '0000-00-00 00:00:00' || empty($item['modified_on'])) {
|
|
|
+ foreach ($lp_list as $item) {
|
|
|
+ if ($item['modified_on'] == '0000-00-00 00:00:00' || empty($item['modified_on'])) {
|
|
|
$lp_date_original = $item['created_on'];
|
|
|
$image = 'new.gif';
|
|
|
$label = get_lang('LearnpathAdded');
|
|
@@ -123,40 +142,42 @@ if (!empty($course_list)) {
|
|
|
$image = 'moderator_star.png';
|
|
|
$label = get_lang('LearnpathUpdated');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$mutation_date = api_strtotime($item['publicated_on']) > api_strtotime($lp_date_original) ? $item['publicated_on'] : $lp_date_original;
|
|
|
-
|
|
|
+
|
|
|
if (api_strtotime($mutation_date) > api_strtotime($max_mutation_date)) {
|
|
|
$max_mutation_date = $mutation_date;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if (strtotime($last_date) < strtotime($lp_date_original)) {
|
|
|
if (empty($icons)) {
|
|
|
- $icons .= ' '.Display::return_icon($image, get_lang('TitleNotification').': '.$label.' - '.$lp_date_original).' ';
|
|
|
+ $icons .= ' '.Display::return_icon($image, get_lang('TitleNotification').': '.$label.' - '.$lp_date_original).' ';
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- $new_course_list[] = array('title'=> $course_data['title'].$icons,
|
|
|
- // 'recent_lps' => $icons,
|
|
|
- //'max_mutation_date' => substr(api_get_local_time($max_mutation_date),0,10),
|
|
|
- 'exercise_count' => $exercise_count,
|
|
|
- 'lp_count' => $lp_count);
|
|
|
+
|
|
|
+ $new_course_list[] = array(
|
|
|
+ 'title'=> $course_data['title'].$icons,
|
|
|
+ // 'recent_lps' => $icons,
|
|
|
+ //'max_mutation_date' => substr(api_get_local_time($max_mutation_date),0,10),
|
|
|
+ 'exercise_count' => $exercise_count,
|
|
|
+ 'lp_count' => $lp_count
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//If the requested session does not exist in my list we stop the script
|
|
|
if (!api_is_platform_admin()) {
|
|
|
- if (!in_array($session_id, $my_session_list)) {
|
|
|
- api_not_allowed(true);
|
|
|
- }
|
|
|
+ if (!in_array($session_id, $my_session_list)) {
|
|
|
+ api_not_allowed(true);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//If session is not active we stop de script
|
|
|
if (!api_is_allowed_to_session_edit()) {
|
|
|
//api_not_allowed();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
Display::display_header(get_lang('Session'));
|
|
|
|
|
|
$session_select = array();
|
|
@@ -165,7 +186,6 @@ foreach ($session_list as $item) {
|
|
|
}
|
|
|
|
|
|
// Session list form
|
|
|
-
|
|
|
if (count($session_select) > 1) {
|
|
|
$form = new FormValidator('exercise_admin', 'get', api_get_self().'?session_id='.$session_id);
|
|
|
$form->addElement('select', 'session_id', get_lang('SessionList'), $session_select, 'onchange="javascript:change_session()"');
|
|
@@ -176,126 +196,127 @@ if (count($session_select) > 1) {
|
|
|
|
|
|
if (empty($session_id)) {
|
|
|
$user_list = UserManager::get_user_list();
|
|
|
-} else {
|
|
|
- $user_list = SessionManager::get_users_by_session($session_id);
|
|
|
+} else {
|
|
|
+ $user_list = SessionManager::get_users_by_session($session_id);
|
|
|
}
|
|
|
|
|
|
//Final data to be show
|
|
|
$my_real_array = $new_exercises = array();
|
|
|
$now = time();
|
|
|
-foreach($final_array as $session_data) {
|
|
|
- $my_course_list = isset($session_data['data']) ? $session_data['data']: array();
|
|
|
- if (!empty($my_course_list))
|
|
|
- foreach ($my_course_list as $my_course_code=>$course_data) {
|
|
|
- if (isset($course_id) && !empty($course_id)) {
|
|
|
- if ($course_id != $course_data['id']) {
|
|
|
- continue;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (!empty($course_data['exercises'])) {
|
|
|
- //Exercises
|
|
|
- foreach ($course_data['exercises'] as $my_exercise_id => $exercise_data) {
|
|
|
- $best_score_data = get_best_attempt_in_course($my_exercise_id, $my_course_code, $session_id);
|
|
|
-
|
|
|
- $best_score = '';
|
|
|
- if (!empty($best_score_data)) {
|
|
|
- $best_score = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);
|
|
|
+foreach ($final_array as $session_data) {
|
|
|
+ $my_course_list = isset($session_data['data']) ? $session_data['data']: array();
|
|
|
+ if (!empty($my_course_list)) {
|
|
|
+ foreach ($my_course_list as $my_course_code=>$course_data) {
|
|
|
+ if (isset($course_id) && !empty($course_id)) {
|
|
|
+ if ($course_id != $course_data['id']) {
|
|
|
+ continue;
|
|
|
}
|
|
|
- //Exercise results
|
|
|
- $counter = 1;
|
|
|
-
|
|
|
- foreach ($exercise_data as $exercise_item) {
|
|
|
- $result_list = $exercise_item['results'];
|
|
|
- $exercise_info = $exercise_item['exercise_data'];
|
|
|
- if ($exercise_info->start_time == '0000-00-00 00:00:00') {
|
|
|
- $start_date = '-';
|
|
|
- } else {
|
|
|
- $start_date = $exercise_info->start_time;
|
|
|
- }
|
|
|
- if (!empty($result_list)) {
|
|
|
- foreach ($result_list as $exercise_result) {
|
|
|
- $platform_score = show_score($exercise_result['exe_result'], $exercise_result['exe_weighting']);
|
|
|
- $my_score = 0;
|
|
|
- if(!empty($exercise_result['exe_weighting']) && intval($exercise_result['exe_weighting']) != 0) {
|
|
|
- $my_score = $exercise_result['exe_result']/$exercise_result['exe_weighting'];
|
|
|
- }
|
|
|
- $position = get_exercise_result_ranking($my_score, $exercise_result['exe_id'], $my_exercise_id, $my_course_code, $session_id, $user_list);
|
|
|
- //$exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/exercice.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id&show=result", array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link'));
|
|
|
- $exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/result.php?cidReq=$my_course_code&id={$exercise_result['exe_id']}&id_session=$session_id&show_headers=1", array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link'));
|
|
|
-
|
|
|
- $my_real_array[]= array( //'date' => api_get_local_time($exercise_result['exe_date']),
|
|
|
- 'status' => Display::return_icon('quiz.gif', get_lang('Attempted'),'', ICON_SIZE_SMALL),
|
|
|
- 'date' => $start_date,
|
|
|
- 'course' => $course_data['name'],
|
|
|
- 'exercise' => $exercise_info->exercise,
|
|
|
- 'attempt' => $counter,
|
|
|
- 'result' => $platform_score,
|
|
|
- 'best_result' => $best_score,
|
|
|
- 'position' => $position
|
|
|
- );
|
|
|
- $counter++;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!empty($course_data['exercises'])) {
|
|
|
+ // Exercises
|
|
|
+ foreach ($course_data['exercises'] as $my_exercise_id => $exercise_data) {
|
|
|
+ $best_score_data = get_best_attempt_in_course($my_exercise_id, $my_course_code, $session_id);
|
|
|
+
|
|
|
+ $best_score = '';
|
|
|
+ if (!empty($best_score_data)) {
|
|
|
+ $best_score = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);
|
|
|
+ }
|
|
|
+ // Exercise results
|
|
|
+ $counter = 1;
|
|
|
+
|
|
|
+ foreach ($exercise_data as $exercise_item) {
|
|
|
+ $result_list = $exercise_item['results'];
|
|
|
+ $exercise_info = $exercise_item['exercise_data'];
|
|
|
+ if ($exercise_info->start_time == '0000-00-00 00:00:00') {
|
|
|
+ $start_date = '-';
|
|
|
+ } else {
|
|
|
+ $start_date = $exercise_info->start_time;
|
|
|
}
|
|
|
- } else {
|
|
|
- //We check the date validation of the exercise if the user can make it
|
|
|
- if ($exercise_info->start_time != '0000-00-00 00:00:00') {
|
|
|
- $allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
|
|
|
- if ($now < $allowed_time) {
|
|
|
- continue;
|
|
|
+ if (!empty($result_list)) {
|
|
|
+ foreach ($result_list as $exercise_result) {
|
|
|
+ $platform_score = show_score($exercise_result['exe_result'], $exercise_result['exe_weighting']);
|
|
|
+ $my_score = 0;
|
|
|
+ if(!empty($exercise_result['exe_weighting']) && intval($exercise_result['exe_weighting']) != 0) {
|
|
|
+ $my_score = $exercise_result['exe_result']/$exercise_result['exe_weighting'];
|
|
|
+ }
|
|
|
+ $position = get_exercise_result_ranking($my_score, $exercise_result['exe_id'], $my_exercise_id, $my_course_code, $session_id, $user_list);
|
|
|
+ //$exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/exercice.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id&show=result", array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link'));
|
|
|
+ $exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/result.php?cidReq=$my_course_code&id={$exercise_result['exe_id']}&id_session=$session_id&show_headers=1", array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link'));
|
|
|
+
|
|
|
+ $my_real_array[]= array(
|
|
|
+ //'date' => api_get_local_time($exercise_result['exe_date']),
|
|
|
+ 'status' => Display::return_icon('quiz.gif', get_lang('Attempted'),'', ICON_SIZE_SMALL),
|
|
|
+ 'date' => $start_date,
|
|
|
+ 'course' => $course_data['name'],
|
|
|
+ 'exercise' => $exercise_info->exercise,
|
|
|
+ 'attempt' => $counter,
|
|
|
+ 'result' => $platform_score,
|
|
|
+ 'best_result' => $best_score,
|
|
|
+ 'position' => $position
|
|
|
+ );
|
|
|
+ $counter++;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //We check the date validation of the exercise if the user can make it
|
|
|
+ if ($exercise_info->start_time != '0000-00-00 00:00:00') {
|
|
|
+ $allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
|
|
|
+ if ($now < $allowed_time) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
}
|
|
|
+ $exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/overview.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id", array('target'=>SESSION_LINK_TARGET));
|
|
|
+ $new_exercises[]= array(
|
|
|
+ //'date' => api_get_local_time($exercise_result['exe_date']),
|
|
|
+ 'status' => Display::return_icon('star.png', get_lang('New'), array('width'=>ICON_SIZE_SMALL)),
|
|
|
+ 'date' => $start_date,
|
|
|
+ 'course' => $course_data['name'],
|
|
|
+ 'exercise' => $exercise_info->exercise,
|
|
|
+ 'attempt' => '-',
|
|
|
+ 'result' => '-',
|
|
|
+ 'best_result' => '-',
|
|
|
+ 'position' => '-'
|
|
|
+ );
|
|
|
}
|
|
|
- $exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/overview.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id", array('target'=>SESSION_LINK_TARGET));
|
|
|
- $new_exercises[]= array( //'date' => api_get_local_time($exercise_result['exe_date']),
|
|
|
- 'status' => Display::return_icon('star.png', get_lang('New'), array('width'=>ICON_SIZE_SMALL)),
|
|
|
- 'date' => $start_date,
|
|
|
- 'course' => $course_data['name'],
|
|
|
- 'exercise' => $exercise_info->exercise,
|
|
|
- 'attempt' => '-',
|
|
|
- 'result' => '-',
|
|
|
- 'best_result' => '-',
|
|
|
- 'position' => '-'
|
|
|
- );
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-$my_real_array = msort($my_real_array, 'date','asc');
|
|
|
+$my_real_array = msort($my_real_array, 'date', 'asc');
|
|
|
|
|
|
if (!empty($new_exercises)) {
|
|
|
$my_real_array = array_merge($new_exercises, $my_real_array);
|
|
|
}
|
|
|
-$back_url = '';
|
|
|
-if (!empty($course_id)) {
|
|
|
- //$back_url = Display::url(Display::return_icon('back.png',get_lang('back.png')), api_get_path(WEB_CODE_PATH).'session/?session_id='.$session_id);
|
|
|
-}
|
|
|
|
|
|
$start = $end = $start_only = $end_only ='';
|
|
|
|
|
|
if (!empty($session_info['date_start']) && $session_info['date_start'] != '0000-00-00') {
|
|
|
- $start = api_convert_and_format_date($session_info['date_start'], DATE_FORMAT_SHORT);
|
|
|
+ $start = api_convert_and_format_date($session_info['date_start'], DATE_FORMAT_SHORT);
|
|
|
$start_only = get_lang('From').' '.$session_info['date_start'];
|
|
|
}
|
|
|
if (!empty($session_info['date_start']) && $session_info['date_end'] != '0000-00-00') {
|
|
|
$end = api_convert_and_format_date($session_info['date_end'], DATE_FORMAT_SHORT);
|
|
|
- $end_only = get_lang('Until').' '.$session_info['date_end'];
|
|
|
+ $end_only = get_lang('Until').' '.$session_info['date_end'];
|
|
|
}
|
|
|
|
|
|
if (!empty($start) && !empty($end)) {
|
|
|
- $dates = Display::tag('i', sprintf(get_lang('FromDateXToDateY'),$start, $end));
|
|
|
+ $dates = Display::tag('i', sprintf(get_lang('FromDateXToDateY'), $start, $end));
|
|
|
} else {
|
|
|
$dates = Display::tag('i', $start_only.' '.$end_only);
|
|
|
}
|
|
|
|
|
|
-echo Display::tag('h1', $back_url.' '.$session_info['name']);
|
|
|
+echo Display::tag('h1', $session_info['name']);
|
|
|
echo $dates.'<br />';
|
|
|
|
|
|
//All Learnpaths grid settings (First tab, first subtab)
|
|
|
|
|
|
-$columns_courses = array(get_lang('Title'), get_lang('NumberOfPublishedExercises'), get_lang('NumberOfPublishedLps'));
|
|
|
-$column_model_courses = array(
|
|
|
+$columns_courses = array(
|
|
|
+ get_lang('Title'), get_lang('NumberOfPublishedExercises'), get_lang('NumberOfPublishedLps')
|
|
|
+);
|
|
|
+$column_model_courses = array(
|
|
|
array('name'=>'title', 'index'=>'title', 'width'=>'400px', 'align'=>'left', 'sortable'=>'true'),
|
|
|
//array('name'=>'recent_lps', 'index'=>'recent_lps', 'width'=>'10px', 'align'=>'left', 'sortable'=>'false'),
|
|
|
// array('name'=>'max_mutation_date', 'index'=>'max_mutation_date', 'width'=>'120px', 'align'=>'left', 'sortable'=>'true'),
|
|
@@ -303,26 +324,26 @@ $column_model_courses = array(
|
|
|
array('name'=>'lp_count', 'index'=>'lp_count', 'width'=>'180px', 'align'=>'left', 'sortable'=>'true')
|
|
|
);
|
|
|
|
|
|
-$extra_params_courses['height'] = '100%';
|
|
|
+$extra_params_courses['height'] = '100%';
|
|
|
$extra_params_courses['autowidth'] = 'true'; //use the width of the parent
|
|
|
|
|
|
//$extra_params_courses['gridview'] = "false";
|
|
|
/*$extra_params_courses['rowNum'] = 9000;
|
|
|
|
|
|
$extra_params_courses['height'] = "100%";
|
|
|
-$extra_params_courses['autowidth'] = 'false'; //use the width of the parent
|
|
|
+$extra_params_courses['autowidth'] = 'false'; //use the width of the parent
|
|
|
$extra_params_courses['recordtext'] = '';
|
|
|
$extra_params_courses['pgtext'] = '';
|
|
|
$extra_params_courses['pgbuttons'] = false;*/
|
|
|
//$extra_params_courses['width'] = '50%';
|
|
|
-//$extra_params_courses['autowidth'] = 'true';
|
|
|
-
|
|
|
+//$extra_params_courses['autowidth'] = 'true';
|
|
|
+
|
|
|
$url = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_default&session_id='.$session_id.'&course_id='.$course_id;
|
|
|
$columns = array(get_lang('PublicationDate'),get_lang('Course'), get_lang('LearningPaths'));
|
|
|
$column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'true'),
|
|
|
array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
|
|
|
array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true'));
|
|
|
-$extra_params = array();
|
|
|
+$extra_params = array();
|
|
|
/*
|
|
|
$extra_params['sortname'] = 'date';
|
|
|
$extra_params['sortorder'] = 'asc';
|
|
@@ -332,84 +353,100 @@ $extra_params['pgtext'] = '';
|
|
|
$extra_params['height'] = "100%";
|
|
|
*/
|
|
|
//$extra_params['autowidth'] = 'true'; //use the width of the parent
|
|
|
-//$extra_params['width'] = '90%';
|
|
|
+//$extra_params['width'] = '90%';
|
|
|
|
|
|
//$extra_params['autowidth'] = 'true'; //use the width of the parent
|
|
|
//$extra_params['forceFit'] = 'true'; //use the width of the parent
|
|
|
//$extra_params['altRows'] = 'true'; //zebra style
|
|
|
|
|
|
-$extra_params['height'] = '100%';
|
|
|
+$extra_params['height'] = '100%';
|
|
|
$extra_params['autowidth'] = 'true'; //use the width of the parent
|
|
|
-
|
|
|
+
|
|
|
//Per course grid settings
|
|
|
$url_by_course = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_by_course&session_id='.$session_id.'&course_id='.$course_id;
|
|
|
$extra_params_course = array();
|
|
|
$extra_params_course['grouping'] = 'true';
|
|
|
-$extra_params_course['groupingView'] = array('groupCollapse' => false,
|
|
|
- 'groupField' => array('course'),
|
|
|
- 'groupColumnShow' => array('false'),
|
|
|
- 'groupText' => array('<b>'.get_lang('Course').' {0}</b>'));
|
|
|
-$extra_params_course['autowidth'] = 'true'; //use the width of the parent
|
|
|
+$extra_params_course['groupingView'] = array(
|
|
|
+ 'groupCollapse' => false,
|
|
|
+ 'groupField' => array('course'),
|
|
|
+ 'groupColumnShow' => array('false'),
|
|
|
+ 'groupText' => array('<b>'.get_lang('Course').' {0}</b>')
|
|
|
+);
|
|
|
+$extra_params_course['autowidth'] = 'true'; //use the width of the parent
|
|
|
$extra_params_course['height'] = "100%";
|
|
|
|
|
|
//Per Week grid
|
|
|
$url_week = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_by_week&session_id='.$session_id.'&course_id='.$course_id;
|
|
|
-$column_week = array(get_lang('PeriodWeek'), get_lang('PublicationDate'), get_lang('Course'), get_lang('LearningPaths'));
|
|
|
+$column_week = array(
|
|
|
+ get_lang('PeriodWeek'), get_lang('PublicationDate'), get_lang('Course'), get_lang('LearningPaths')
|
|
|
+);
|
|
|
$column_week_model = array (
|
|
|
- array('name'=>'week', 'index'=>'week', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
|
|
|
- array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'false'),
|
|
|
- array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
|
|
|
- array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true'));
|
|
|
+ array('name'=>'week', 'index'=>'week', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
|
|
|
+ array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'false'),
|
|
|
+ array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
|
|
|
+ array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true')
|
|
|
+);
|
|
|
|
|
|
-$extra_params_week = array();
|
|
|
+$extra_params_week = array();
|
|
|
$extra_params_week['grouping'] = 'true';
|
|
|
//For more details see http://www.trirand.com/jqgridwiki/doku.php?id=wiki:grouping
|
|
|
-$extra_params_week['groupingView'] = array('groupCollapse' => false,
|
|
|
- 'groupDataSorted' => false,
|
|
|
- 'groupField' => array('week'),
|
|
|
- 'groupOrder' => array('desc'),
|
|
|
- 'groupColumnShow' => 'false',
|
|
|
- 'groupText' => array('<b>'.get_lang('PeriodWeek').' {0}</b>'));
|
|
|
+$extra_params_week['groupingView'] = array(
|
|
|
+ 'groupCollapse' => false,
|
|
|
+ 'groupDataSorted' => false,
|
|
|
+ 'groupField' => array('week'),
|
|
|
+ 'groupOrder' => array('desc'),
|
|
|
+ 'groupColumnShow' => 'false',
|
|
|
+ 'groupText' => array('<b>'.get_lang('PeriodWeek').' {0}</b>')
|
|
|
+);
|
|
|
$extra_params_week['autowidth'] = 'true'; //use the width of the parent
|
|
|
-$extra_params_week['height'] = '100%';
|
|
|
-
|
|
|
-//MyQCM grid
|
|
|
-$column_exercise = array(get_lang('Status'), get_lang('ExerciseStartDate'), get_lang('Course'), get_lang('Exercise'),get_lang('Attempts'), get_lang('Result'), get_lang('BestResultInCourse'), get_lang('Ranking'));
|
|
|
+$extra_params_week['height'] = '100%';
|
|
|
+
|
|
|
+// MyQCM grid
|
|
|
+$column_exercise = array(
|
|
|
+ get_lang('Status'),
|
|
|
+ get_lang('ExerciseStartDate'),
|
|
|
+ get_lang('Course'),
|
|
|
+ get_lang('Exercise'),
|
|
|
+ get_lang('Attempts'),
|
|
|
+ get_lang('Result'),
|
|
|
+ get_lang('BestResultInCourse'),
|
|
|
+ get_lang('Ranking')
|
|
|
+);
|
|
|
$column_exercise_model = array(
|
|
|
- array('name'=>'status', 'index'=>'status', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
|
|
|
- array('name'=>'date', 'index'=>'date', 'width'=>'130','align'=>'left', 'sortable'=>'true'),
|
|
|
- array('name'=>'course', 'index'=>'course', 'width'=>'200','align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
|
|
|
- array('name'=>'exercise', 'index'=>'exercise', 'width'=>'200','align'=>'left', 'sortable'=>'false'),
|
|
|
- array('name'=>'attempt', 'index'=>'attempt', 'width'=>'60', 'align'=>'center', 'sortable'=>'true'),
|
|
|
- array('name'=>'result', 'index'=>'result', 'width'=>'120','align'=>'center', 'sortable'=>'true'),
|
|
|
- array('name'=>'best_result','index'=>'best_result','width'=>'140','align'=>'center', 'sortable'=>'true'),
|
|
|
- array('name'=>'position', 'index'=>'position', 'width'=>'55', 'align'=>'center', 'sortable'=>'true')
|
|
|
- );
|
|
|
+ array('name'=>'status', 'index'=>'status', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
|
|
|
+ array('name'=>'date', 'index'=>'date', 'width'=>'130','align'=>'left', 'sortable'=>'true'),
|
|
|
+ array('name'=>'course', 'index'=>'course', 'width'=>'200','align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
|
|
|
+ array('name'=>'exercise', 'index'=>'exercise', 'width'=>'200','align'=>'left', 'sortable'=>'false'),
|
|
|
+ array('name'=>'attempt', 'index'=>'attempt', 'width'=>'60', 'align'=>'center', 'sortable'=>'true'),
|
|
|
+ array('name'=>'result', 'index'=>'result', 'width'=>'120','align'=>'center', 'sortable'=>'true'),
|
|
|
+ array('name'=>'best_result','index'=>'best_result','width'=>'140','align'=>'center', 'sortable'=>'true'),
|
|
|
+ array('name'=>'position', 'index'=>'position', 'width'=>'55', 'align'=>'center', 'sortable'=>'true')
|
|
|
+);
|
|
|
$extra_params_exercise['height'] = '100%';
|
|
|
$extra_params_exercise['autowidth'] = 'true';
|
|
|
//$extra_params_exercise['sortname'] = 'status';
|
|
|
-//$extra_params_exercise['sortorder'] = 'desc';
|
|
|
+//$extra_params_exercise['sortorder'] = 'desc';
|
|
|
//$extra_params_exercise['grouping'] = 'true';
|
|
|
//$extra_params_exercise['groupingView'] = array('groupField'=>array('course'),'groupColumnShow'=>'false','groupText' => array('<b>'.get_lang('Course').' {0}</b>'));
|
|
|
//$extra_params_exercise['groupingView'] = array('groupField'=>array('course'),'groupColumnShow'=>'false','groupText' => array('<b>'.get_lang('Course').' {0} - {1} Item(s)</b>'));
|
|
|
-
|
|
|
+
|
|
|
?>
|
|
|
<br />
|
|
|
<script>
|
|
|
function change_session() {
|
|
|
document.exercise_admin.submit();
|
|
|
-}
|
|
|
-
|
|
|
-$(function() {
|
|
|
+}
|
|
|
+
|
|
|
+$(function() {
|
|
|
//js used when generating images on the fly see function Tracking::show_course_detail()
|
|
|
- $(".dialog").dialog("destroy");
|
|
|
+ $(".dialog").dialog("destroy");
|
|
|
$(".dialog").dialog({
|
|
|
- autoOpen: false,
|
|
|
- show: "blind",
|
|
|
- resizable: false,
|
|
|
- height:300,
|
|
|
- width:550,
|
|
|
- modal: true
|
|
|
+ autoOpen: false,
|
|
|
+ show: "blind",
|
|
|
+ resizable: false,
|
|
|
+ height:300,
|
|
|
+ width:550,
|
|
|
+ modal: true
|
|
|
});
|
|
|
$(".opener").click(function() {
|
|
|
var my_id = $(this).attr('id');
|
|
@@ -417,31 +454,27 @@ $(function() {
|
|
|
$( big_image ).dialog("open");
|
|
|
return false;
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
/* Binds a tab id in the url */
|
|
|
$("#tabs").bind('tabsselect', function(event, ui) {
|
|
|
window.location.href=ui.tab;
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
<?php
|
|
|
//Displays js code to use a jqgrid
|
|
|
echo Display::grid_js('courses', '', $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
|
|
|
echo Display::grid_js('list_default', $url, $columns, $column_model,$extra_params,array(), '');
|
|
|
echo Display::grid_js('list_course', $url_by_course, $columns, $column_model,$extra_params_course,array(),'');
|
|
|
- echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week,array(),'');
|
|
|
- echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);
|
|
|
+ echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week,array(),'');
|
|
|
+ echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);
|
|
|
?>
|
|
|
-
|
|
|
-
|
|
|
//Generate tabs with jquery-ui
|
|
|
$('#tabs').tabs();
|
|
|
- $( "#sub_tab" ).tabs();
|
|
|
+ $( "#sub_tab" ).tabs();
|
|
|
});
|
|
|
</script>
|
|
|
|
|
|
-<?php
|
|
|
-$my_reporting = Tracking::show_user_progress(api_get_user_id(), $session_id, '#tabs-4', false);
|
|
|
+<?php
|
|
|
+$my_reporting = Tracking::show_user_progress(api_get_user_id(), $session_id, '#tabs-4', false);
|
|
|
if (!empty($my_reporting)) {
|
|
|
$my_reporting .= '<br />'.Tracking::show_course_detail(api_get_user_id(), $_GET['course'], $session_id);
|
|
|
}
|
|
@@ -449,15 +482,15 @@ if (empty($my_reporting)) {
|
|
|
$my_reporting = Display::return_message(get_lang('NoDataAvailable'), 'warning');
|
|
|
}
|
|
|
|
|
|
-//Main headers
|
|
|
+// Main headers
|
|
|
$headers = array(get_lang('Courses'), get_lang('LearningPaths'), get_lang('MyQCM'), get_lang('MyStatistics'));
|
|
|
-//Subheaders
|
|
|
+// Subheaders
|
|
|
$sub_header = array(get_lang('AllLearningPaths'), get_lang('PerWeek'), get_lang('ByCourse'));
|
|
|
|
|
|
-//Sub headers data
|
|
|
+// Sub headers data
|
|
|
$lp_tabs = Display::tabs($sub_header, array(Display::grid_html('list_default'), Display::grid_html('list_week'), Display::grid_html('list_course')), 'sub_tab');
|
|
|
$courses_tab = Display::grid_html('courses');
|
|
|
-//Main headers data
|
|
|
+// Main headers data
|
|
|
echo Display::tabs($headers, array($courses_tab, $lp_tabs, Display::grid_html('exercises'), $my_reporting));
|
|
|
|
|
|
Display::display_footer();
|