From 4654570b23cd1a11048dd5ae902e0e81534b5ece Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 16 Oct 2017 11:20:42 +0200 Subject: [PATCH] Minor - format code --- main/tracking/exams.php | 12 +- main/tracking/lp_results_by_user.php | 5 +- main/tracking/question_course_report.php | 224 +++++++++++------------ 3 files changed, 117 insertions(+), 124 deletions(-) diff --git a/main/tracking/exams.php b/main/tracking/exams.php index e76a59e854..ac83aa5462 100755 --- a/main/tracking/exams.php +++ b/main/tracking/exams.php @@ -246,11 +246,9 @@ if (!empty($courseList) && is_array($courseList)) { if (Database::num_rows($resultExercises) > 0) { while ($exercise = Database::fetch_array($resultExercises, 'ASSOC')) { - $exerciseSessionId = $exercise['session_id']; if (empty($exerciseSessionId)) { - if ($global) { // If the exercise was created in the base course. // Load all sessions. @@ -280,7 +278,6 @@ if (!empty($courseList) && is_array($courseList)) { $html .= $result['html']; $export_array_global = array_merge($export_array_global, $result['export_array_global']); } else { - if (empty($sessionId)) { // Load base course. $result = processStudentList( @@ -298,7 +295,6 @@ if (!empty($courseList) && is_array($courseList)) { $result['export_array_global'] ); } else { - $result = processStudentList( $filter_score, $global, @@ -317,7 +313,6 @@ if (!empty($courseList) && is_array($courseList)) { } } else { // If the exercise only exists in this session. - $result = processStudentList( $filter_score, $global, @@ -370,7 +365,8 @@ if ($exportToXLS) { * @param $b * @return int */ -function sort_user($a, $b) { +function sort_user($a, $b) +{ if (is_numeric($a['score']) && is_numeric($b['score'])) { if ($a['score'] < $b['score']) { return 1; @@ -484,8 +480,7 @@ function export_complete_report_xls($filename, $array) */ function processStudentList($filter_score, $global, $exercise, $courseInfo, $sessionId, $newSessionList) { - if ( - (isset($exercise['id']) && empty($exercise['id'])) || + if ((isset($exercise['id']) && empty($exercise['id'])) || !isset($exercise['id']) ) { return array( @@ -519,7 +514,6 @@ function processStudentList($filter_score, $global, $exercise, $courseInfo, $ses } $html = null; - $totalStudents = count($students); if (!$global) { diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php index 28b0b9ef61..3fa45eec7b 100755 --- a/main/tracking/lp_results_by_user.php +++ b/main/tracking/lp_results_by_user.php @@ -2,7 +2,6 @@ /* For licensing terms, see /license.txt */ /** - * * Exercise results from Learning paths * * @todo implement pagination @@ -34,7 +33,7 @@ if (api_is_platform_admin()) { if ($global) { $temp_course_list = CourseManager :: get_courses_list(); - foreach ($temp_course_list as $temp_course_item) { + foreach ($temp_course_list as $temp_course_item) { $course_item = api_get_course_info($temp_course_item['code']); $course_list[] = array( 'code' => $course_item['code'], @@ -254,6 +253,6 @@ function export_complete_report_csv($filename, $array) Export :: arrayToCsv($array, $filename); } exit; - } + Display :: display_footer(); diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php index 12375172e4..13a15c7075 100755 --- a/main/tracking/question_course_report.php +++ b/main/tracking/question_course_report.php @@ -14,20 +14,20 @@ $this_section = "session_my_space"; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_session_general_coach || $is_sessionAdmin; if (!$is_allowedToTrack) { - Display::display_header(null); - api_not_allowed(); - Display::display_footer(); + Display::display_header(null); + api_not_allowed(); + Display::display_footer(); } $export_to_xls = false; if (isset($_GET['export'])) { - $export_to_xls = true; + $export_to_xls = true; } if (api_is_platform_admin()) { - $global = true; + $global = true; } else { - $global = false; + $global = false; } $global = true; @@ -38,21 +38,21 @@ $course_select_list[0] = get_lang('None'); $htmlHeadXtra[] = ' '; $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null; if (empty($session_id)) { - $temp_course_list = CourseManager::get_courses_list(); + $temp_course_list = CourseManager::get_courses_list(); } else { - $temp_course_list = SessionManager::get_course_list_by_session_id($session_id); + $temp_course_list = SessionManager::get_course_list_by_session_id($session_id); } -foreach ($temp_course_list as $temp_course_item) { - $course_item = api_get_course_info($temp_course_item['code']); - $course_select_list[$temp_course_item['code']] = $course_item['title']; +foreach ($temp_course_list as $temp_course_item) { + $course_item = api_get_course_info($temp_course_item['code']); + $course_select_list[$temp_course_item['code']] = $course_item['title']; } //Get session list @@ -95,132 +95,132 @@ $form->setDefaults(array('course_code'=>(string) $course_code)); $course_info = api_get_course_info($course_code); if (!empty($course_info)) { - $list = new LearnpathList('', $course_code); - $lp_list = $list->get_flat_list(); + $list = new LearnpathList('', $course_code); + $lp_list = $list->get_flat_list(); - $main_question_list = array(); + $main_question_list = array(); - foreach ($lp_list as $lp_id => $lp) { + foreach ($lp_list as $lp_id => $lp) { $exercise_list = Event::get_all_exercises_from_lp( $lp_id, $course_info['real_id'] ); - foreach ($exercise_list as $exercise) { - $my_exercise = new Exercise($course_info['real_id']); - $my_exercise->read($exercise['path']); - $question_list = $my_exercise->selectQuestionList(); - - $exercise_stats = Event::get_all_exercise_event_from_lp( - $exercise['path'], - $course_info['real_id'], - $session_id - ); - - foreach ($question_list as $question_id) { - $question_data = Question::read($question_id); - $main_question_list[$question_id] = $question_data; - $quantity_exercises = 0; - $question_result = 0; - - foreach ($exercise_stats as $stats) { - if (!empty($stats['question_list'])) { - foreach ($stats['question_list'] as $my_question_stat) { - if ($question_id == $my_question_stat['question_id']) { - $question_result = $question_result + $my_question_stat['marks']; - $quantity_exercises++; - } - } - } - } - - if (!empty($quantity_exercises)) { - // Score % average - $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises)); - } else { - $main_question_list[$question_id]->results = 0; - } - - $main_question_list[$question_id]->quantity = $quantity_exercises; - } - } - } + foreach ($exercise_list as $exercise) { + $my_exercise = new Exercise($course_info['real_id']); + $my_exercise->read($exercise['path']); + $question_list = $my_exercise->selectQuestionList(); + + $exercise_stats = Event::get_all_exercise_event_from_lp( + $exercise['path'], + $course_info['real_id'], + $session_id + ); + + foreach ($question_list as $question_id) { + $question_data = Question::read($question_id); + $main_question_list[$question_id] = $question_data; + $quantity_exercises = 0; + $question_result = 0; + + foreach ($exercise_stats as $stats) { + if (!empty($stats['question_list'])) { + foreach ($stats['question_list'] as $my_question_stat) { + if ($question_id == $my_question_stat['question_id']) { + $question_result = $question_result + $my_question_stat['marks']; + $quantity_exercises++; + } + } + } + } + + if (!empty($quantity_exercises)) { + // Score % average + $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises)); + } else { + $main_question_list[$question_id]->results = 0; + } + + $main_question_list[$question_id]->quantity = $quantity_exercises; + } + } + } } if (!$export_to_xls) { - Display::display_header(get_lang("MySpace")); - echo '
'; - if ($global) { - echo MySpace::getTopMenu(); - } else { - echo '
- '. + Display::display_header(get_lang("MySpace")); + echo '
'; + if ($global) { + echo MySpace::getTopMenu(); + } else { + echo '
+ '. get_lang('StudentsTracking').' | - '. + '. get_lang('CourseTracking').' '; - echo '
'; - } - echo '
'; + echo '
'; + } + echo '
'; - if (api_is_platform_admin()) { - echo MySpace::getAdminActions(); - } - echo '
'; - echo '

'.get_lang('LPQuestionListResults').'

'; + if (api_is_platform_admin()) { + echo MySpace::getAdminActions(); + } + echo '
'; + echo '

'.get_lang('LPQuestionListResults').'

'; - $form->display(); + $form->display(); - if (empty($course_code)) { - echo Display::return_message(get_lang('PleaseSelectACourse'), 'warning'); - } + if (empty($course_code)) { + echo Display::return_message(get_lang('PleaseSelectACourse'), 'warning'); + } } $course_average = array(); $counter = 0; if (!empty($main_question_list) && is_array($main_question_list)) { - $html_result .= ''; - $html_result .= ''; + $html_result .= ''; + + foreach ($main_question_list as $question) { + $total_student = 0; + $counter++; + $s_css_class = 'row_even'; + if ($counter % 2 == 0) { + $s_css_class = 'row_odd'; + } + $html_result .= " + "; + $html_result .= ""; + + $html_result .= ""; + } + + $html_result .= ""; + $html_result .= '
'.get_lang('Question'). + $html_result .= ''; + $html_result .= ''; - $html_result .= ''; - $html_result .= ''; - - foreach ($main_question_list as $question) { - $total_student = 0; - $counter++; - $s_css_class = 'row_even'; - if ($counter % 2 == 0) { - $s_css_class = 'row_odd'; - } - $html_result .= " - "; - $html_result .= ""; - - $html_result .= ""; - } - - $html_result .= ""; - $html_result .= '
'.get_lang('Question'). Display::return_icon('info3.gif', get_lang('QuestionsAreTakenFromLPExercises'), array('align' => 'absmiddle', 'hspace' => '3px')).''.$course_info['visual_code'].' '.get_lang('AverageScore').Display::return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' '.get_lang('Quantity').'
"; - $question_title = trim($question->question); - if (empty($question_title)) { - $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id; - } else { - $html_result .= $question->question; - } - - $html_result .= ""; - $html_result .= round($question->results, 2).' / '.$question->weighting; - $html_result .= ""; - $html_result .= $question->quantity; - $html_result .= "
'; + $html_result .= '		'.$course_info['visual_code'].' '.get_lang('AverageScore').Display::return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' '.get_lang('Quantity').'
"; + $question_title = trim($question->question); + if (empty($question_title)) { + $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id; + } else { + $html_result .= $question->question; + } + + $html_result .= ""; + $html_result .= round($question->results, 2).' / '.$question->weighting; + $html_result .= ""; + $html_result .= $question->quantity; + $html_result .= "
'; } else { - if (!empty($course_code)) { - echo Display::return_message(get_lang('NoResults'), 'warning'); - } + if (!empty($course_code)) { + echo Display::return_message(get_lang('NoResults'), 'warning'); + } } if (!$export_to_xls) { - echo $html_result; + echo $html_result; } Display::display_footer();