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

Minor - format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent e4c1f270f5
commit cb1df90ba8
2 changed files with 215 additions and 142 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. 49
      main/inc/lib/tracking.lib.php
  2. 90
      main/session/index.php

49
main/inc/lib/tracking.lib.php
Unescape View File

@ -2823,6 +2823,7 @@ class Tracking
$tbl_access_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$user_id = intval($user_id);
// get course list
@ -2915,13 +2916,24 @@ class Tracking
</tr>';
foreach ($courses as $course_code => $course_title) {
$weighting = 0;
$total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $course_code);
$total_time_login = Tracking :: get_time_spent_on_the_course(
$user_id,
$course_code
);
$time = api_time_to_hms($total_time_login);
$progress = Tracking :: get_avg_student_progress($user_id, $course_code);
$percentage_score = Tracking :: get_avg_student_score($user_id, $course_code, array());
$last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $course_code);
$progress = Tracking :: get_avg_student_progress(
$user_id,
$course_code
);
$percentage_score = Tracking :: get_avg_student_score(
$user_id,
$course_code,
array()
);
$last_connection = Tracking :: get_last_connection_date_on_the_course(
$user_id,
$course_code
);
if (is_null($progress)) {
$progress = '0%';
@ -2967,9 +2979,6 @@ class Tracking
// Session list
if (!empty($course_in_session)) {
$main_session_graph = '';
//if (!isset($_GET['session_id']) && !isset($_GET['course'])) {
//Load graphics only when calling to an specific session
$session_graph = array();
@ -3006,12 +3015,17 @@ class Tracking
$exercise_graph_list[] = $best_average;
$all_exercise_graph_list[] = $best_average;
$user_result_data = get_best_attempt_by_user(api_get_user_id(), $exercise_data['id'], $course_data['code'], $my_session_id);
$user_result_data = get_best_attempt_by_user(
api_get_user_id(),
$exercise_data['id'],
$course_data['code'],
$my_session_id
);
$score = 0;
if (!empty($user_result_data['exe_weighting']) && intval($user_result_data['exe_weighting']) != 0) {
$score = intval($user_result_data['exe_result']/$user_result_data['exe_weighting'] * 100);
}
//$user_results[] = $score;
$time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0;
$all_exercise_start_time[] = $time;
$my_results[] = $score;
@ -3049,15 +3063,16 @@ class Tracking
$my_results_final[] = $my_results[$key];
$final_all_exercise_graph_list[] = $all_exercise_graph_list[$key];
}
$main_session_graph = self::generate_session_exercise_graph($final_all_exercise_graph_name_list, $my_results_final, $final_all_exercise_graph_list);
$main_session_graph = self::generate_session_exercise_graph(
$final_all_exercise_graph_name_list,
$my_results_final,
$final_all_exercise_graph_list
);
}
//}
$html .= Display::page_subheader(Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL).' '.get_lang('Sessions'));
$html .= '<table class="data_table" width="100%">';
//'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).'
$html .= '<tr>
'.Display::tag('th', get_lang('Session'), array('width'=>'300px')).'
'.Display::tag('th', get_lang('PublishedExercises'), array('width'=>'300px')).'
@ -3122,7 +3137,7 @@ class Tracking
} else {
$html .= '<tr>';
}
$url = api_get_path(WEB_CODE_PATH)."session/?session_id={$my_session_id}";
$url = api_get_path(WEB_CODE_PATH)."session/index.php?session_id={$my_session_id}";
$html .= Display::tag('td', Display::url($session_name, $url, array('target'=>SESSION_LINK_TARGET)));
$html .= Display::tag('td', $all_exercises);
@ -3142,7 +3157,7 @@ class Tracking
$html .= '</table><br />';
$html .= Display::div($main_session_graph, array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') );
//Checking selected session
// Checking selected session.
if (isset($_GET['session_id'])) {
$session_id_from_get = intval($_GET['session_id']);

90
main/session/index.php
Unescape View File

@ -118,6 +118,7 @@ if (!empty($course_list)) {
'publicated_on ASC',
true
);
$lp_list = $list->get_flat_list();
$lp_count = 0;
@ -129,9 +130,9 @@ if (!empty($course_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(
@ -161,7 +162,10 @@ if (!empty($course_list)) {
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
).' ';
}
}
}
@ -250,12 +254,22 @@ foreach ($final_array as $session_data) {
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'));
$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/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'],
@ -275,9 +289,13 @@ foreach ($final_array as $session_data) {
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));
$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'],
@ -349,11 +367,20 @@ $extra_params_courses['pgbuttons'] = false;*/
//$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'),
$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'));
array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true')
);
$extra_params = array();
/*
$extra_params['sortname'] = 'date';
$extra_params['sortorder'] = 'asc';
@ -388,8 +415,12 @@ $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')
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'),
@ -458,6 +489,7 @@ $(function() {
width:550,
modal: true
});
$(".opener").click(function() {
var my_id = $(this).attr('id');
var big_image = '#main_graph_' + my_id;
@ -493,14 +525,40 @@ if (empty($my_reporting)) {
}
// Main headers
$headers = array(get_lang('Courses'), get_lang('LearningPaths'), get_lang('MyQCM'), get_lang('MyStatistics'));
$headers = array(
get_lang('Courses'),
get_lang('LearningPaths'),
get_lang('MyQCM'),
get_lang('MyStatistics')
);
// Sub headers
$sub_header = array(get_lang('AllLearningPaths'), get_lang('PerWeek'), get_lang('ByCourse'));
$sub_header = array(
get_lang('AllLearningPaths'),
get_lang('PerWeek'),
get_lang('ByCourse')
);
// 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');
$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
echo Display::tabs($headers, array($courses_tab, $lp_tabs, Display::grid_html('exercises'), $my_reporting));
echo Display::tabs(
$headers,
array(
$courses_tab,
$lp_tabs,
Display::grid_html('exercises'),
$my_reporting
)
);
Display::display_footer();

Write Preview
Loading…
Cancel
Save