Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/tracking/exams.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 if (!$exportToXLS) {
83 83
     Display :: display_header(get_lang('Reporting'));
84
-    $actionsLeft = $actionsRight ='';
84
+    $actionsLeft = $actionsRight = '';
85 85
     if ($global) {
86 86
 
87 87
         $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'.
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
         }
99 99
 
100 100
         $actionsRight .= '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exerciseId.'&'.$courseLink.'">'.
101
-            Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a>';
101
+            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
102 102
         $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print()">'.
103
-            Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
103
+            Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
104 104
         
105 105
 
106 106
         $menuItems[] = Display::url(
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     }
148 148
     
149 149
     
150
-    $toolbar = Display::toolbarAction('toolbar-exams', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
150
+    $toolbar = Display::toolbarAction('toolbar-exams', $content = array(0 => $actionsLeft, 1 => $actionsRight));
151 151
     echo $toolbar;
152 152
 
153 153
     $form->display();
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             $countExercises = Database::store_result($result);
208 208
             $exerciseSessionCount = $countExercises[0]['count'];
209 209
 
210
-            $exerciseCount =  $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount;
210
+            $exerciseCount = $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount;
211 211
 
212 212
             // Add course and session list.
213 213
             if ($exerciseCount == 0) {
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
         $column++;
425 425
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamNotTaken'));
426 426
         $column++;
427
-        $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score) . '%');
427
+        $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score).'%');
428 428
         $column++;
429 429
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamFail'));
430 430
         $column++;
@@ -442,15 +442,15 @@  discard block
 block discarded – undo
442 442
         }
443 443
         $line++;
444 444
     } else {
445
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Exercises'));
445
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Exercises'));
446 446
         $column++;
447
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('User'));
447
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('User'));
448 448
         $column++;
449
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Percentage'));
449
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Percentage'));
450 450
         $column++;
451
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Status'));
451
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
452 452
         $column++;
453
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Attempts'));
453
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Attempts'));
454 454
         $column++;
455 455
         $line++;
456 456
         foreach ($array as $row) {
@@ -601,10 +601,10 @@  discard block
 block discarded – undo
601 601
         $percentageScore = 0;
602 602
 
603 603
         if ($weighting != 0) {
604
-            $percentageScore = round(($score*100)/$weighting);
604
+            $percentageScore = round(($score * 100) / $weighting);
605 605
         }
606 606
 
607
-        if ($attempts['count'] > 0 ) {
607
+        if ($attempts['count'] > 0) {
608 608
             $taken++;
609 609
         }
610 610
 
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
             } else {
648 648
                 $score = '-';
649 649
                 $userRow .= '<td>';
650
-                $userRow .=  '-';
650
+                $userRow .= '-';
651 651
                 $tempArray[] = '-';
652 652
                 $userRow .= '</td>';
653 653
 
@@ -701,13 +701,13 @@  discard block
 block discarded – undo
701 701
         // Exam taken
702 702
         $html .= '<td>';
703 703
         $html .= $taken;
704
-        $globalRow[]= $taken;
704
+        $globalRow[] = $taken;
705 705
         $html .= '</td>';
706 706
 
707 707
         // Exam NOT taken
708 708
         $html .= '<td>';
709 709
         $html .= $not_taken = $totalStudents - $taken;
710
-        $globalRow[]= $not_taken;
710
+        $globalRow[] = $not_taken;
711 711
         $html .= '</td>';
712 712
 
713 713
         // Exam pass
@@ -718,19 +718,19 @@  discard block
 block discarded – undo
718 718
         }
719 719
 
720 720
         $html .= $total_with_parameter_score;
721
-        $globalRow[]= $total_with_parameter_score;
721
+        $globalRow[] = $total_with_parameter_score;
722 722
         $html .= '</td>';
723 723
 
724 724
         // Exam fail
725 725
         $html .= '<td>';
726 726
 
727 727
         $html .= $fail = $taken - $total_with_parameter_score;
728
-        $globalRow[]= $fail;
728
+        $globalRow[] = $fail;
729 729
         $html .= '</td>';
730 730
 
731 731
         $html .= '<td>';
732 732
         $html .= $totalStudents;
733
-        $globalRow[]= $totalStudents;
733
+        $globalRow[] = $totalStudents;
734 734
 
735 735
         $html .= '</td>';
736 736
 
Please login to merge, or discard this patch.
main/tracking/course_log_tools.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 // getting all the students of the course
80 80
 if (empty($session_id)) {
81
-	// Registered students in a course outside session.
81
+    // Registered students in a course outside session.
82 82
     $a_students = CourseManager:: get_student_list_from_course_code(
83 83
         api_get_course_id(),
84 84
         false,
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         api_get_group_id()
90 90
     );
91 91
 } else {
92
-	// Registered students in session.
92
+    // Registered students in session.
93 93
     $a_students = CourseManager:: get_student_list_from_course_code(
94 94
         api_get_course_id(),
95 95
         true,
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 
66 66
 // Breadcrumbs.
67 67
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
68
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
69
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
68
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
69
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
70 70
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
71 71
 }
72 72
 
@@ -134,10 +134,10 @@  discard block
 block discarded – undo
134 134
 
135 135
 echo '<span style="float:right; padding-top:0px;">';
136 136
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
137
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
137
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
138 138
 
139 139
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&id_session='.api_get_session_id().'&export=csv">
140
-	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
140
+	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
141 141
 
142 142
 echo '</span>';
143 143
 echo '</div>';
Please login to merge, or discard this patch.
main/tracking/courseLog.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
                             get_lang('HideColumn'),
112 112
                             array('align' => 'absmiddle', 'hspace' => '3px'),
113 113
                             ICON_SIZE_SMALL
114
-                         ) . "</div>'
114
+                            ) . "</div>'
115 115
                     );
116 116
                 }
117 117
             );
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
                             get_lang('HideColumn'),
113 113
                             array('align' => 'absmiddle', 'hspace' => '3px'),
114 114
                             ICON_SIZE_SMALL
115
-                         ) . "</div>'
115
+                         )."</div>'
116 116
                     );
117 117
                 }
118 118
             );
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 $TABLETRACK_LINKS       = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS);
148 148
 $TABLETRACK_DOWNLOADS   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
149 149
 $TABLETRACK_ACCESS_2    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
150
-$TABLETRACK_EXERCISES 	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
150
+$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
151 151
 $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
152 152
 $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
153 153
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 
158 158
 // Breadcrumbs.
159 159
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
160
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
161
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
160
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
161
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
162 162
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview'));
163 163
 }
164 164
 
@@ -229,21 +229,21 @@  discard block
 block discarded – undo
229 229
 if (!empty($sessionId)) {
230 230
     $actionsLeft .= Display::url(
231 231
         Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM),
232
-        api_get_path(WEB_CODE_PATH) . 'attendance/index.php?' . api_get_cidreq() . '&action=calendar_logins'
232
+        api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins'
233 233
     );
234 234
 }
235 235
 
236 236
 $actionsRight = '<div class="pull-right">';
237 237
 $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
238
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
238
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
239 239
 
240 240
 $addional_param = '';
241 241
 if (isset($_GET['additional_profile_field'])) {
242
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
242
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
243 243
 }
244 244
 $users_tracking_per_page = '';
245 245
 if (isset($_GET['users_tracking_per_page'])) {
246
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
246
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
247 247
 }
248 248
 $actionsRight .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
249 249
      '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
@@ -264,13 +264,13 @@  discard block
 block discarded – undo
264 264
 $form_search->addButtonSearch(get_lang('SearchUsers'));
265 265
 
266 266
 
267
-echo Display::toolbarAction('toolbar-courselog', array( 0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight ), 3);
267
+echo Display::toolbarAction('toolbar-courselog', array(0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight), 3);
268 268
 
269 269
 $course_name = get_lang('Course').' '.$courseInfo['name'];
270 270
 
271 271
 if ($session_id) {
272 272
     $titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
273
-    $titleCourse =  Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
273
+    $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
274 274
 
275 275
 } else {
276 276
     $titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
     $html .= '<ul class="session-list">';
313 313
     foreach ($sessionList as $session) {
314 314
         $url = api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id'].'&cidReq='.$courseInfo['code'];
315
-        $html .= Display::tag('li', $iconCourse . ' ' . Display::url($session['name'], $url));
315
+        $html .= Display::tag('li', $iconCourse.' '.Display::url($session['name'], $url));
316 316
     }
317 317
     $html .= '</ul>';
318 318
 }
@@ -327,12 +327,12 @@  discard block
 block discarded – undo
327 327
     $form = new FormValidator(
328 328
         'reminder_form',
329 329
         'get',
330
-        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?' . api_get_cidreq(),
330
+        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(),
331 331
         null,
332 332
         ['style' => 'margin-bottom: 10px'],
333 333
         FormValidator::LAYOUT_INLINE
334 334
     );
335
-    $options = array (
335
+    $options = array(
336 336
         2 => sprintf($getLangXDays, 2),
337 337
         3 => sprintf($getLangXDays, 3),
338 338
         4 => sprintf($getLangXDays, 4),
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
     );
346 346
     $el = $form->addSelect(
347 347
         'since',
348
-        Display::returnFontAwesomeIcon('warning') . get_lang('RemindInactivesLearnersSince'),
348
+        Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
349 349
         $options,
350 350
         ['class' => 'col-sm-3']
351 351
     );
Please login to merge, or discard this patch.
main/tracking/course_log_resources.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 
46 46
 // Breadcrumbs.
47 47
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
48
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin'));
49
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList'));
48
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php', 'name' => get_lang('PlatformAdmin'));
49
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php', 'name' => get_lang('SessionList'));
50 50
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
51 51
 }
52 52
 
@@ -76,21 +76,21 @@  discard block
 block discarded – undo
76 76
 echo Display::return_icon('tools_na.png', get_lang('ResourcesTracking'), array(), ICON_SIZE_MEDIUM);
77 77
 echo '<span style="float:right; padding-top:0px;">';
78 78
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
79
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).
79
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).
80 80
 '</a>';
81 81
 
82 82
 $addional_param = '';
83 83
 if (isset($_GET['additional_profile_field'])) {
84
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
84
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
85 85
 }
86 86
 
87 87
 $users_tracking_per_page = '';
88 88
 if (isset($_GET['users_tracking_per_page'])) {
89
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
89
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
90 90
 }
91 91
 
92 92
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
93
-'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
93
+'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
94 94
 
95 95
 echo '</span>';
96 96
 echo '</div>';
Please login to merge, or discard this patch.
main/tracking/courseLogCSV.php 2 patches
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -53,16 +53,16 @@  discard block
 block discarded – undo
53 53
 if ($view == "00000010")
54 54
     $nameTools = get_lang('ScormAccess');
55 55
 
56
-$interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
56
+$interbreadcrumb[] = array("url" => api_get_self()."?view=0000000", "name" => get_lang('ToolName'));
57 57
 
58
-include(api_get_path(LIBRARY_PATH) . "statsUtils.lib.inc.php");
58
+include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php");
59 59
 include("../resourcelinker/resourcelinker.inc.php");
60 60
 
61 61
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || api_is_drh();
62 62
 
63 63
 /* 	MAIN CODE */
64 64
 
65
-$title[0] = get_lang('StatsOfCourse') . " : " . $_course['official_code'];
65
+$title[0] = get_lang('StatsOfCourse')." : ".$_course['official_code'];
66 66
 
67 67
 
68 68
 $courseInfo = api_get_course_info($_course['official_code']);
@@ -94,40 +94,40 @@  discard block
 block discarded – undo
94 94
         $sql = "SELECT $TABLECOURSUSER.user_i, $table_user.lastname, $table_user.firstname
95 95
                 FROM $TABLECOURSUSER, $table_user
96 96
                 WHERE
97
-                    $TABLECOURSUSER.c_id = '" . api_get_course_int_id() . "' AND
97
+                    $TABLECOURSUSER.c_id = '".api_get_course_int_id()."' AND
98 98
                     $TABLECOURSUSER.user_id = $table_user.user_id AND
99
-                    $TABLECOURSUSER.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
99
+                    $TABLECOURSUSER.relation_type<>".COURSE_RELATION_TYPE_RRHH."
100 100
                 ORDER BY $table_user.lastname";
101 101
         $results = StatsUtils::getManyResults3Col($sql);
102 102
 
103 103
         //BUGFIX: get visual code instead of real course code. Scormpaths use the visual code... (should be fixed in future versions)
104
-        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '" . api_get_course_id() . "'";
104
+        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '".api_get_course_id()."'";
105 105
         $_course['visual_code'] = StatsUtils::getOneResult($sql);
106 106
 
107 107
         if (is_array($results)) {
108 108
             $line = '';
109
-            $title_line = get_lang('Name') . ";" . get_lang('FirstAccess') . ";" . get_lang('LastAccess') . ";" . get_lang('Visited') . "\n";
109
+            $title_line = get_lang('Name').";".get_lang('FirstAccess').";".get_lang('LastAccess').";".get_lang('Visited')."\n";
110 110
 
111 111
             for ($j = 0; $j < count($results); $j++) {
112 112
                 // BEGIN % visited
113 113
                 // sum of all items (= multiple learningpaths + SCORM imported paths)
114
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " .
114
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv ".
115 115
                         "INNER JOIN $tbl_learnpath_view v
116
-                        ON iv.lp_view_id = v.id " .
116
+                        ON iv.lp_view_id = v.id ".
117 117
                         "WHERE
118 118
                         	v.c_id = $course_id AND
119 119
                         	iv.c_id = $course_id AND
120
-                		v.user_id = " . $results[$j][0];
120
+                		v.user_id = ".$results[$j][0];
121 121
                 $total_lpath_items = StatsUtils::getOneResult($sql);
122 122
 
123 123
                 // sum of all completed items (= multiple learningpaths + SCORM imported paths)
124
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " .
125
-                        "FROM $tbl_learnpath_item_view iv " .
126
-                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " .
124
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) ".
125
+                        "FROM $tbl_learnpath_item_view iv ".
126
+                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id ".
127 127
                         "WHERE
128 128
                         	v.c_id = $course_id AND
129 129
                         	iv.c_id = $course_id AND
130
-                        	v.user_id = " . $results[$j][0] . " " .
130
+                        	v.user_id = ".$results[$j][0]." ".
131 131
                         "AND (status = 'completed' OR status='passed')";
132 132
                 $total_lpath_items_completed = StatsUtils::getOneResult($sql);
133 133
 
@@ -138,23 +138,23 @@  discard block
 block discarded – undo
138 138
                 // BEGIN first/last access
139 139
                 // first access
140 140
                 $sql = "SELECT access_date FROM $TABLETRACK_ACCESS_2
141
-                        WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath' AND access_session_id = '" . api_get_session_id() . "'
141
+                        WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath' AND access_session_id = '".api_get_session_id()."'
142 142
                         ORDER BY access_id ASC LIMIT 1";
143 143
                 $first_access = StatsUtils::getOneResult($sql);
144 144
                 $first_access = empty($first_access) ? "-" : date('d.m.y', strtotime($first_access));
145 145
 
146 146
                 // last access
147
-                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath'";
147
+                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath'";
148 148
                 $last_access = StatsUtils::getOneResult($sql);
149 149
                 $last_access = empty($last_access) ? "-" : date('d.m.y', strtotime($last_access));
150 150
                 // END first/last access
151 151
                 // BEGIN presentation of data
152
-                $line .= $results[$j][1] . " " . $results[$j][2] . ";" . $first_access . ";" . $last_access . ";" . $lpath_pct_completed . "\n";
152
+                $line .= $results[$j][1]." ".$results[$j][2].";".$first_access.";".$last_access.";".$lpath_pct_completed."\n";
153 153
 
154 154
                 // END presentation of data
155 155
             }
156 156
         } else {
157
-            $line = get_lang('NoResult') . "\n";
157
+            $line = get_lang('NoResult')."\n";
158 158
         }
159 159
     }
160 160
 
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 
167 167
         $sql = "SELECT count(*)
168 168
                 FROM $TABLECOURSUSER
169
-                WHERE c_id = '" . api_get_course_int_id() . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "";
169
+                WHERE c_id = '".api_get_course_int_id()."' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
170 170
         $count = StatsUtils::getOneResult($sql);
171
-        $title_line = get_lang('CountUsers') . " ; " . $count . "\n";
171
+        $title_line = get_lang('CountUsers')." ; ".$count."\n";
172 172
     }
173 173
 
174 174
     /* 	Access to this course */
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
                     AND access_tool IS NULL";
187 187
         $count = StatsUtils::getOneResult($sql);
188 188
 
189
-        $line .= get_lang('CountToolAccess') . " ; " . $count . "\n";
189
+        $line .= get_lang('CountToolAccess')." ; ".$count."\n";
190 190
 
191 191
         // last 31 days
192 192
         $sql = "SELECT count(*)
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
                     AND access_tool IS NULL";
197 197
         $count = StatsUtils::getOneResult($sql);
198 198
 
199
-        $line .= get_lang('Last31days') . " ; " . $count . "\n";
199
+        $line .= get_lang('Last31days')." ; ".$count."\n";
200 200
 
201 201
         // last 7 days
202 202
         $sql = "SELECT count(*)
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
                     AND access_tool IS NULL";
207 207
         $count = StatsUtils::getOneResult($sql);
208 208
 
209
-        $line .= get_lang('Last7days') . " ; " . $count . "\n";
209
+        $line .= get_lang('Last7days')." ; ".$count."\n";
210 210
 
211 211
         // today
212 212
         $sql = "SELECT count(*)
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
                     AND ( access_date > CURDATE() )
216 216
                     AND access_tool IS NULL";
217 217
         $count = StatsUtils::getOneResult($sql);
218
-        $line .= get_lang('ThisDay') . " ; " . $count . "\n";
218
+        $line .= get_lang('ThisDay')." ; ".$count."\n";
219 219
     }
220 220
 
221 221
     /* 	Tools */
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
         $tempView[2] = '0';
225 225
         $title[1] = $nameTools;
226 226
         $line = '';
227
-        $title_line = get_lang('ToolTitleToolnameColumn') . ";" . get_lang('ToolTitleUsersColumn') . ";" . get_lang('ToolTitleCountColumn') . "\n";
227
+        $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n";
228 228
 
229 229
         $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool )
230 230
                 FROM $TABLETRACK_ACCESS
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 
237 237
         if (is_array($results)) {
238 238
             for ($j = 0; $j < count($results); $j++) {
239
-                $line .= $results[$j][0] . "/" . get_lang($results[$j][0]) . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
239
+                $line .= $results[$j][0]."/".get_lang($results[$j][0]).";".$results[$j][1].";".$results[$j][2]."\n";
240 240
             }
241 241
         } else {
242
-            $line = get_lang('NoResult') . "\n";
242
+            $line = get_lang('NoResult')."\n";
243 243
         }
244 244
     }
245 245
 
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
 
262 262
         $title[1] = $nameTools;
263 263
         $line = '';
264
-        $title_line = get_lang('LinksTitleLinkColumn') . ";" . get_lang('LinksTitleUsersColumn') . ";" . get_lang('LinksTitleCountColumn') . "\n";
264
+        $title_line = get_lang('LinksTitleLinkColumn').";".get_lang('LinksTitleUsersColumn').";".get_lang('LinksTitleCountColumn')."\n";
265 265
 
266 266
         if (is_array($results)) {
267 267
             for ($j = 0; $j < count($results); $j++) {
268
-                $line .= $results[$j][1] . "'>" . $results[$j][0] . ";" . $results[$j][2] . ";" . $results[$j][3] . "\n";
268
+                $line .= $results[$j][1]."'>".$results[$j][0].";".$results[$j][2].";".$results[$j][3]."\n";
269 269
             }
270 270
         } else {
271
-            $line = get_lang('NoResult') . "\n";
271
+            $line = get_lang('NoResult')."\n";
272 272
         }
273 273
     }
274 274
 
@@ -287,13 +287,13 @@  discard block
 block discarded – undo
287 287
 
288 288
         $title[1] = $nameTools;
289 289
         $line = '';
290
-        $title_line = get_lang('DocumentsTitleDocumentColumn') . ";" . get_lang('DocumentsTitleUsersColumn') . ";" . get_lang('DocumentsTitleCountColumn') . "\n";
290
+        $title_line = get_lang('DocumentsTitleDocumentColumn').";".get_lang('DocumentsTitleUsersColumn').";".get_lang('DocumentsTitleCountColumn')."\n";
291 291
         if (is_array($results)) {
292 292
             for ($j = 0; $j < count($results); $j++) {
293
-                $line .= $results[$j][0] . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
293
+                $line .= $results[$j][0].";".$results[$j][1].";".$results[$j][2]."\n";
294 294
             }
295 295
         } else {
296
-            $line = get_lang('NoResult') . "\n";
296
+            $line = get_lang('NoResult')."\n";
297 297
         }
298 298
     }
299 299
 
@@ -321,10 +321,10 @@  discard block
 block discarded – undo
321 321
                 //echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."' class='specialLink'>$lp_title</a>";
322 322
                 if ($ar['id'] == $scormcontopen) { //have to list the students here
323 323
                     $contentId = $ar['id'];
324
-                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname " .
325
-                            "FROM  $tbl_learnpath_view sd " .
326
-                            "INNER JOIN $table_user u " .
327
-                            "ON u.user_id = sd.user_id " .
324
+                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname ".
325
+                            "FROM  $tbl_learnpath_view sd ".
326
+                            "INNER JOIN $table_user u ".
327
+                            "ON u.user_id = sd.user_id ".
328 328
                             "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id";
329 329
                     //error_log($sql2,0);
330 330
                     $result2 = Database::query($sql2);
@@ -336,28 +336,28 @@  discard block
 block discarded – undo
336 336
                         while ($ar2 != '') {
337 337
 
338 338
                             if (isset($_REQUEST["scormstudentopen"]) && $ar2['user_id'] == $scormstudentopen) {
339
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
339
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
340 340
                             } else {
341
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
341
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
342 342
                             }
343 343
 
344 344
                             if ($ar2['user_id'] == $scormstudentopen) { //have to list the student's results
345 345
                                 $studentId = $ar2['user_id'];
346
-                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
347
-                                        "FROM $tbl_learnpath_item i " .
348
-                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
349
-                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
346
+                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
347
+                                        "FROM $tbl_learnpath_item i ".
348
+                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
349
+                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
350 350
                                         "WHERE 	i.c_id = $course_id AND
351 351
                                         		iv.c_id = $course_id AND
352 352
                                         		v.c_id = $course_id AND
353 353
                                 				v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id";
354 354
                                 $result3 = Database::query($sql3);
355 355
                                 $ar3 = Database::fetch_array($result3);
356
-                                $title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn');
356
+                                $title_line .= get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn');
357 357
                                 while ($ar3['status'] != '') {
358 358
                                     require_once '../newscorm/learnpathItem.class.php';
359 359
                                     $time = learnpathItem::getScormTimeFromParameter('php', $ar3['total_time']);
360
-                                    $line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time;
360
+                                    $line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time;
361 361
                                     $ar3 = Database::fetch_array($result3);
362 362
                                 }
363 363
                             }
@@ -377,23 +377,23 @@  discard block
 block discarded – undo
377 377
      * Export to a CSV file
378 378
      * Force the browser to save the file instead of opening it.
379 379
      */
380
-    $len = strlen($title_line . $line);
380
+    $len = strlen($title_line.$line);
381 381
     header('Content-type: application/octet-stream');
382 382
     //header('Content-Type: application/force-download');
383
-    header('Content-length: ' . $len);
384
-    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv')));
383
+    header('Content-length: '.$len);
384
+    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0].'_'.$title[1].'.csv')));
385 385
     $filename = api_replace_dangerous_char($filename);
386 386
     if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
387
-        header('Content-Disposition: filename= ' . $filename);
387
+        header('Content-Disposition: filename= '.$filename);
388 388
     } else {
389
-        header('Content-Disposition: attachment; filename= ' . $filename);
389
+        header('Content-Disposition: attachment; filename= '.$filename);
390 390
     }
391 391
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
392 392
         header('Pragma: ');
393 393
         header('Cache-Control: ');
394 394
         header('Cache-Control: public'); // IE cannot download from sessions without a cache
395 395
     }
396
-    header('Content-Description: ' . $filename);
396
+    header('Content-Description: '.$filename);
397 397
     header('Content-transfer-encoding: binary');
398 398
 
399 399
     echo api_html_entity_decode($title_line, ENT_COMPAT);
Please login to merge, or discard this patch.
Braces   +17 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,20 +38,27 @@  discard block
 block discarded – undo
38 38
 
39 39
 $view = $_REQUEST['view'];
40 40
 
41
-if ($view == "0000001")
41
+if ($view == "0000001") {
42 42
     $nameTools = get_lang('SynthesisView');
43
-if ($view == "1000000")
43
+}
44
+if ($view == "1000000") {
44 45
     $nameTools = get_lang('CourseStats');
45
-if ($view == "0100000")
46
+}
47
+if ($view == "0100000") {
46 48
     $nameTools = get_lang('CourseAccess');
47
-if ($view == "0010000")
49
+}
50
+if ($view == "0010000") {
48 51
     $nameTools = get_lang('ToolsAccess');
49
-if ($view == "0001000")
52
+}
53
+if ($view == "0001000") {
50 54
     $nameTools = get_lang('LinksAccess');
51
-if ($view == "0000100")
55
+}
56
+if ($view == "0000100") {
52 57
     $nameTools = get_lang('DocumentsAccess');
53
-if ($view == "00000010")
58
+}
59
+if ($view == "00000010") {
54 60
     $nameTools = get_lang('ScormAccess');
61
+}
55 62
 
56 63
 $interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
57 64
 
@@ -79,8 +86,9 @@  discard block
 block discarded – undo
79 86
       </div><br>
80 87
       "; */
81 88
 
82
-    if (!isset($view))
83
-        $view = "0000000";
89
+    if (!isset($view)) {
90
+            $view = "0000000";
91
+    }
84 92
 
85 93
 
86 94
     /* 	Reporting */
Please login to merge, or discard this patch.
main/tracking/userlogCSV.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 $is_allowed = true;
27 27
 
28 28
 /* Libraries */
29
-require_once api_get_path(SYS_CODE_PATH) . 'resourcelinker/resourcelinker.inc.php';
30
-require_once api_get_path(SYS_CODE_PATH) . 'exercice/hotpotatoes.lib.php';
29
+require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
30
+require_once api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php';
31 31
 
32 32
 /* Header */
33 33
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             AND ((access_start_date <= '$now'
72 72
             AND access_end_date >= '$now')
73 73
             OR (access_start_date='0000-00-00' AND access_end_date='0000-00-00'))
74
-        WHERE session_id='" . $_SESSION['id_session'] . "' AND c_id = $courseId";
74
+        WHERE session_id='".$_SESSION['id_session']."' AND c_id = $courseId";
75 75
 //echo $sql;
76 76
 $result = Database::query($sql);
77 77
 if (!Database::num_rows($result)) {
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 $tbl_learnpath_view = Database::get_course_table(TABLE_LP_VIEW);
85 85
 $tbl_learnpath_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
86 86
 
87
-$documentPath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document';
87
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
88 88
 
89 89
 // The variables for the days and the months
90 90
 $DaysShort = api_get_week_days_short();
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             // if user can track everybody : list user of course
117 117
             $sql = "SELECT count(user_id)
118 118
                     FROM $TABLECOURSUSER
119
-                    WHERE c_id = '$courseId' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "";
119
+                    WHERE c_id = '$courseId' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
120 120
 
121 121
         } else {
122 122
             // if user can only track one group : list users of this group
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             // list of users in this course
155 155
             $sql = "SELECT u.user_id, u.firstname,u.lastname
156 156
                 FROM $TABLECOURSUSER cu , $TABLEUSER u
157
-                WHERE cu.user_id = u.user_id AND cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
157
+                WHERE cu.user_id = u.user_id AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
158 158
                 AND cu.c_id = '$courseId'
159 159
                 LIMIT $offset,$step";
160 160
         } else {
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
             // check if user is in this course
181 181
             $tracking_is_accepted = $is_course_member;
182 182
             $tracked_user_info = api_get_user_info($uInfo);
183
-            $title[0] = $tracked_user_info[1] . '_' . $tracked_user_info[2];
183
+            $title[0] = $tracked_user_info[1].'_'.$tracked_user_info[2];
184 184
         } else {
185 185
             // check if user is in the group of this tutor
186 186
             $sql = "SELECT u.firstname,u.lastname, u.email
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                 $tracking_is_accepted = true;
195 195
             }
196 196
 
197
-            $title[0] = $tracked_user_info['firstname'] . '_' . $tracked_user_info['lastname'];
197
+            $title[0] = $tracked_user_info['firstname'].'_'.$tracked_user_info['lastname'];
198 198
         }
199 199
 
200 200
         if ($tracking_is_accepted) {
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
                 $_cid
243 243
             );
244 244
 
245
-            $title_line = $title_line1 . $title_line2 . $title_line3 . $title_line4 . $title_line5;
246
-            $line = $line1 . $line2 . $line3 . $line4 . $line5;
245
+            $title_line = $title_line1.$title_line2.$title_line3.$title_line4.$title_line5;
246
+            $line = $line1.$line2.$line3.$line4.$line5;
247 247
         } else {
248 248
             echo get_lang('ErrorUserNotInGroup');
249 249
         }
@@ -310,22 +310,22 @@  discard block
 block discarded – undo
310 310
      * force the browser to save the file instead of opening it
311 311
      */
312 312
 
313
-    $len = strlen($title_line . $line);
313
+    $len = strlen($title_line.$line);
314 314
     header('Content-type: application/octet-stream');
315 315
     //header('Content-Type: application/force-download');
316
-    header('Content-length: ' . $len);
316
+    header('Content-length: '.$len);
317 317
     $filename = html_entity_decode(
318 318
         str_replace(
319 319
             ":",
320 320
             "",
321
-            str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv')
321
+            str_replace(" ", "_", $title[0].'_'.$title[1].'.csv')
322 322
         )
323 323
     );
324 324
     $filename = api_replace_dangerous_char($filename);
325 325
     if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
326
-        header('Content-Disposition: filename= ' . $filename);
326
+        header('Content-Disposition: filename= '.$filename);
327 327
     } else {
328
-        header('Content-Disposition: attachment; filename= ' . $filename);
328
+        header('Content-Disposition: attachment; filename= '.$filename);
329 329
     }
330 330
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
331 331
         header('Pragma: ');
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
             'Cache-Control: public'
335 335
         ); // IE cannot download from sessions without a cache
336 336
     }
337
-    header('Content-Description: ' . $filename);
337
+    header('Content-Description: '.$filename);
338 338
     header('Content-transfer-encoding: binary');
339 339
 
340 340
     echo api_html_entity_decode($title_line, ENT_QUOTES, $charset);
Please login to merge, or discard this patch.
main/tracking/course_session_report.php 3 patches
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -14,23 +14,23 @@  discard block
 block discarded – undo
14 14
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
15 15
 
16 16
 if (!$is_allowedToTrack) {
17
-	api_not_allowed(true);
17
+    api_not_allowed(true);
18 18
 }
19 19
 
20 20
 $export_to_xls = false;
21 21
 if (isset($_GET['export'])) {
22
-	$export_to_xls = true;
22
+    $export_to_xls = true;
23 23
 }
24 24
 if (api_is_platform_admin() ) {
25
-	$global = true;
25
+    $global = true;
26 26
 } else {
27
-	$global = false;
27
+    $global = false;
28 28
 }
29 29
 $global = true;
30 30
 
31 31
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
32 32
 if (empty($session_id)) {
33
-	$session_id  = 1;
33
+    $session_id  = 1;
34 34
 }
35 35
 
36 36
 $form = new FormValidator('search_simple','POST','','',null,false);
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
40 40
 $my_session_list = array();
41 41
 foreach($session_list as $sesion_item) {
42
-	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
42
+    $my_session_list[$sesion_item['id']] = $sesion_item['name'];
43 43
 }
44 44
 if (count($session_list) == 0) {
45
-	$my_session_list[0] = get_lang('None');
45
+    $my_session_list[0] = get_lang('None');
46 46
 }
47 47
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
48 48
 $form->addButtonFilter(get_lang('Filter'));
@@ -51,32 +51,32 @@  discard block
 block discarded – undo
51 51
 if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
52 52
 
53 53
 if (empty($session_id)) {
54
-	$session_id = key($my_session_list);
54
+    $session_id = key($my_session_list);
55 55
 }
56 56
 $form->setDefaults(array('session_id'=>$session_id));
57 57
 $course_list = SessionManager::get_course_list_by_session_id($session_id);
58 58
 
59 59
 if (!$export_to_xls) {
60
-	Display :: display_header(get_lang("MySpace"));
61
-	echo '<div class="actions">';
60
+    Display :: display_header(get_lang("MySpace"));
61
+    echo '<div class="actions">';
62 62
 
63
-	if ($global) {
64
-		echo MySpace::getTopMenu();
65
-	} else {
66
-		echo '<div style="float:left; clear:left">
63
+    if ($global) {
64
+        echo MySpace::getTopMenu();
65
+    } else {
66
+        echo '<div style="float:left; clear:left">
67 67
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
68 68
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;';
69
-		echo '</div>';
70
-	}
71
-	echo '</div>';
69
+        echo '</div>';
70
+    }
71
+    echo '</div>';
72 72
 
73
-	if  (api_is_platform_admin()) {
74
-		echo MySpace::getAdminActions();
75
-	}
73
+    if  (api_is_platform_admin()) {
74
+        echo MySpace::getAdminActions();
75
+    }
76 76
 
77
-	echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
78
-	$form->display();
79
-	Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
77
+    echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
78
+    $form->display();
79
+    Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
80 80
 }
81 81
 
82 82
 $users = SessionManager::get_users_by_session($session_id);
@@ -86,15 +86,15 @@  discard block
 block discarded – undo
86 86
 $main_result = array();
87 87
 //Getting course list
88 88
 foreach ($course_list  as $current_course ) {
89
-	$course_info = api_get_course_info($current_course['code']);
90
-	$_course = $course_info;
91
-	$attempt_result = array();
89
+    $course_info = api_get_course_info($current_course['code']);
90
+    $_course = $course_info;
91
+    $attempt_result = array();
92 92
 
93
-	//Getting LP list
94
-	$list = new LearnpathList('', $current_course['code'], $session_id);
95
-	$lp_list = $list->get_flat_list();
93
+    //Getting LP list
94
+    $list = new LearnpathList('', $current_course['code'], $session_id);
95
+    $lp_list = $list->get_flat_list();
96 96
 
97
-	// Looping LPs
97
+    // Looping LPs
98 98
     foreach ($lp_list as $lp_id =>$lp) {
99 99
         $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
100 100
         // Looping Chamilo Exercises in LP
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
             }
112 112
         }
113 113
     }
114
-	$main_result[$current_course['code']] = $attempt_result;
114
+    $main_result[$current_course['code']] = $attempt_result;
115 115
 }
116 116
 
117 117
 $total_average_score = 0;
@@ -119,102 +119,102 @@  discard block
 block discarded – undo
119 119
 $html_result = '';
120 120
 if (!empty($users) && is_array($users)) {
121 121
 
122
-	$html_result .= '<table  class="data_table">';
123
-	$html_result .= '<tr><th>'.get_lang('User').'</th>';
124
-	foreach($course_list as $item ) {
125
-		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
126
-	}
127
-	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
128
-	$html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
129
-
130
-	foreach ($users  as $user) {
131
-		$total_student = 0;
132
-		$counter ++;
133
-		$s_css_class = 'row_even';
134
-		if ($counter % 2 ==0 ) {
135
-			$s_css_class = 'row_odd';
136
-		}
137
-		$html_result .= "<tr class='$s_css_class'>
122
+    $html_result .= '<table  class="data_table">';
123
+    $html_result .= '<tr><th>'.get_lang('User').'</th>';
124
+    foreach($course_list as $item ) {
125
+        $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
126
+    }
127
+    $html_result .= '<th>'.get_lang('AverageScore').' %</th>';
128
+    $html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
129
+
130
+    foreach ($users  as $user) {
131
+        $total_student = 0;
132
+        $counter ++;
133
+        $s_css_class = 'row_even';
134
+        if ($counter % 2 ==0 ) {
135
+            $s_css_class = 'row_odd';
136
+        }
137
+        $html_result .= "<tr class='$s_css_class'>
138 138
 							<td >";
139
-		$html_result .= $user['firstname'].' '.$user['lastname'];
140
-		$html_result .= "</td>";
141
-
142
-		// Getting course list
143
-
144
-		$counter = 0;
145
-		$total_result_by_user = 0;
146
-		foreach ($course_list  as $current_course ) {
147
-			$total_course = 0;
148
-			$html_result .= "<td>";
149
-
150
-
151
-			$result  = '-';
152
-			if (isset($main_result[$current_course['code']][$user['user_id']])) {
153
-				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
154
-				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
155
-					$result = round(
156
-						$user_info_stat['result'] / $user_info_stat['attempts'] * 100,
157
-						2
158
-					);
159
-					$total_course += $result;
160
-					$total_result_by_user += $result;
161
-					$course_average[$current_course['code']] += $total_course;
162
-					$course_average_counter[$current_course['code']]++;
163
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
164
-							'Attempts'
165
-						) . ')';
166
-					$counter++;
167
-				}
168
-			}
169
-
170
-			$html_result .= $result;
171
-			$html_result .= "</td>";
172
-		}
173
-		if (empty($counter)) {
174
-			$total_student = '-';
175
-		} else {
176
-			$total_student = $total_result_by_user/$counter;
177
-			$total_average_score+=$total_student;
178
-			$total_average_score_count++;
179
-		}
180
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
181
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
182
-	}
183
-
184
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
185
-	$total_average = 0;
186
-	$counter = 0;
187
-	foreach($course_list as $course_item) {
188
-		if (!empty($course_average_counter[$course_item['code']])) {
189
-			$average_per_course = round(
190
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
191
-				2
192
-			);
193
-		} else {
194
-			$average_per_course = '-';
195
-		}
196
-		if (!empty($average_per_course)) {
197
-			$counter++;
198
-		}
199
-		$total_average = $total_average + $average_per_course;
200
-		$html_result .="<td>$average_per_course</td>";
201
-	}
202
-	if (!empty($total_average_score_count)) {
203
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
204
-	} else {
205
-		$total_average = '-';
206
-	}
207
-
208
-	$html_result .='<td>'.$total_average.'</td>';
209
-	$html_result .="<td>-</td>";
210
-	$html_result .="</tr>";
211
-	$html_result .= '</table>';
139
+        $html_result .= $user['firstname'].' '.$user['lastname'];
140
+        $html_result .= "</td>";
141
+
142
+        // Getting course list
143
+
144
+        $counter = 0;
145
+        $total_result_by_user = 0;
146
+        foreach ($course_list  as $current_course ) {
147
+            $total_course = 0;
148
+            $html_result .= "<td>";
149
+
150
+
151
+            $result  = '-';
152
+            if (isset($main_result[$current_course['code']][$user['user_id']])) {
153
+                $user_info_stat = $main_result[$current_course['code']][$user['user_id']];
154
+                if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
155
+                    $result = round(
156
+                        $user_info_stat['result'] / $user_info_stat['attempts'] * 100,
157
+                        2
158
+                    );
159
+                    $total_course += $result;
160
+                    $total_result_by_user += $result;
161
+                    $course_average[$current_course['code']] += $total_course;
162
+                    $course_average_counter[$current_course['code']]++;
163
+                    $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
164
+                            'Attempts'
165
+                        ) . ')';
166
+                    $counter++;
167
+                }
168
+            }
169
+
170
+            $html_result .= $result;
171
+            $html_result .= "</td>";
172
+        }
173
+        if (empty($counter)) {
174
+            $total_student = '-';
175
+        } else {
176
+            $total_student = $total_result_by_user/$counter;
177
+            $total_average_score+=$total_student;
178
+            $total_average_score_count++;
179
+        }
180
+        $string_date=Tracking :: get_last_connection_date($user['user_id'],true);
181
+        $html_result .="<td>$total_student</td><td>$string_date</td></tr>";
182
+    }
183
+
184
+    $html_result .="<tr><th>".get_lang('AverageScore')."</th>";
185
+    $total_average = 0;
186
+    $counter = 0;
187
+    foreach($course_list as $course_item) {
188
+        if (!empty($course_average_counter[$course_item['code']])) {
189
+            $average_per_course = round(
190
+                $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
191
+                2
192
+            );
193
+        } else {
194
+            $average_per_course = '-';
195
+        }
196
+        if (!empty($average_per_course)) {
197
+            $counter++;
198
+        }
199
+        $total_average = $total_average + $average_per_course;
200
+        $html_result .="<td>$average_per_course</td>";
201
+    }
202
+    if (!empty($total_average_score_count)) {
203
+        $total_average = round($total_average_score/($total_average_score_count*100)*100,2);
204
+    } else {
205
+        $total_average = '-';
206
+    }
207
+
208
+    $html_result .='<td>'.$total_average.'</td>';
209
+    $html_result .="<td>-</td>";
210
+    $html_result .="</tr>";
211
+    $html_result .= '</table>';
212 212
 } else {
213
-	Display::display_warning_message(get_lang('NoResults'));
213
+    Display::display_warning_message(get_lang('NoResults'));
214 214
 }
215 215
 
216 216
 if (!$export_to_xls) {
217
-	echo $html_result;
217
+    echo $html_result;
218 218
 }
219 219
 
220 220
 Display :: display_footer();
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 if (isset($_GET['export'])) {
22 22
 	$export_to_xls = true;
23 23
 }
24
-if (api_is_platform_admin() ) {
24
+if (api_is_platform_admin()) {
25 25
 	$global = true;
26 26
 } else {
27 27
 	$global = false;
@@ -30,15 +30,15 @@  discard block
 block discarded – undo
30 30
 
31 31
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
32 32
 if (empty($session_id)) {
33
-	$session_id  = 1;
33
+	$session_id = 1;
34 34
 }
35 35
 
36
-$form = new FormValidator('search_simple','POST','','',null,false);
36
+$form = new FormValidator('search_simple', 'POST', '', '', null, false);
37 37
 
38 38
 //Get session list
39 39
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
40 40
 $my_session_list = array();
41
-foreach($session_list as $sesion_item) {
41
+foreach ($session_list as $sesion_item) {
42 42
 	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
43 43
 }
44 44
 if (count($session_list) == 0) {
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	}
71 71
 	echo '</div>';
72 72
 
73
-	if  (api_is_platform_admin()) {
73
+	if (api_is_platform_admin()) {
74 74
 		echo MySpace::getAdminActions();
75 75
 	}
76 76
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 $counter = 0;
86 86
 $main_result = array();
87 87
 //Getting course list
88
-foreach ($course_list  as $current_course ) {
88
+foreach ($course_list  as $current_course) {
89 89
 	$course_info = api_get_course_info($current_course['code']);
90 90
 	$_course = $course_info;
91 91
 	$attempt_result = array();
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 	$html_result .= '<table  class="data_table">';
123 123
 	$html_result .= '<tr><th>'.get_lang('User').'</th>';
124
-	foreach($course_list as $item ) {
124
+	foreach ($course_list as $item) {
125 125
 		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
126 126
 	}
127 127
 	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 
130 130
 	foreach ($users  as $user) {
131 131
 		$total_student = 0;
132
-		$counter ++;
132
+		$counter++;
133 133
 		$s_css_class = 'row_even';
134
-		if ($counter % 2 ==0 ) {
134
+		if ($counter % 2 == 0) {
135 135
 			$s_css_class = 'row_odd';
136 136
 		}
137 137
 		$html_result .= "<tr class='$s_css_class'>
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 
144 144
 		$counter = 0;
145 145
 		$total_result_by_user = 0;
146
-		foreach ($course_list  as $current_course ) {
146
+		foreach ($course_list  as $current_course) {
147 147
 			$total_course = 0;
148 148
 			$html_result .= "<td>";
149 149
 
150 150
 
151
-			$result  = '-';
151
+			$result = '-';
152 152
 			if (isset($main_result[$current_course['code']][$user['user_id']])) {
153 153
 				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
154 154
 				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
@@ -160,9 +160,9 @@  discard block
 block discarded – undo
160 160
 					$total_result_by_user += $result;
161 161
 					$course_average[$current_course['code']] += $total_course;
162 162
 					$course_average_counter[$current_course['code']]++;
163
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
163
+					$result = $result.' ('.$user_info_stat['attempts'].' '.get_lang(
164 164
 							'Attempts'
165
-						) . ')';
165
+						).')';
166 166
 					$counter++;
167 167
 				}
168 168
 			}
@@ -173,21 +173,21 @@  discard block
 block discarded – undo
173 173
 		if (empty($counter)) {
174 174
 			$total_student = '-';
175 175
 		} else {
176
-			$total_student = $total_result_by_user/$counter;
177
-			$total_average_score+=$total_student;
176
+			$total_student = $total_result_by_user / $counter;
177
+			$total_average_score += $total_student;
178 178
 			$total_average_score_count++;
179 179
 		}
180
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
181
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
180
+		$string_date = Tracking :: get_last_connection_date($user['user_id'], true);
181
+		$html_result .= "<td>$total_student</td><td>$string_date</td></tr>";
182 182
 	}
183 183
 
184
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
184
+	$html_result .= "<tr><th>".get_lang('AverageScore')."</th>";
185 185
 	$total_average = 0;
186 186
 	$counter = 0;
187
-	foreach($course_list as $course_item) {
187
+	foreach ($course_list as $course_item) {
188 188
 		if (!empty($course_average_counter[$course_item['code']])) {
189 189
 			$average_per_course = round(
190
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
190
+				$course_average[$course_item['code']] / ($course_average_counter[$course_item['code']] * 100) * 100,
191 191
 				2
192 192
 			);
193 193
 		} else {
@@ -197,17 +197,17 @@  discard block
 block discarded – undo
197 197
 			$counter++;
198 198
 		}
199 199
 		$total_average = $total_average + $average_per_course;
200
-		$html_result .="<td>$average_per_course</td>";
200
+		$html_result .= "<td>$average_per_course</td>";
201 201
 	}
202 202
 	if (!empty($total_average_score_count)) {
203
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
203
+		$total_average = round($total_average_score / ($total_average_score_count * 100) * 100, 2);
204 204
 	} else {
205 205
 		$total_average = '-';
206 206
 	}
207 207
 
208
-	$html_result .='<td>'.$total_average.'</td>';
209
-	$html_result .="<td>-</td>";
210
-	$html_result .="</tr>";
208
+	$html_result .= '<td>'.$total_average.'</td>';
209
+	$html_result .= "<td>-</td>";
210
+	$html_result .= "</tr>";
211 211
 	$html_result .= '</table>';
212 212
 } else {
213 213
 	Display::display_warning_message(get_lang('NoResults'));
Please login to merge, or discard this patch.
Braces   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,8 +47,16 @@
 block discarded – undo
47 47
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
48 48
 $form->addButtonFilter(get_lang('Filter'));
49 49
 
50
-if (!empty($_REQUEST['score']))	$filter_score = intval($_REQUEST['score']); else $filter_score = 70;
51
-if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
50
+if (!empty($_REQUEST['score'])) {
51
+    $filter_score = intval($_REQUEST['score']);
52
+} else {
53
+    $filter_score = 70;
54
+}
55
+if (!empty($_REQUEST['session_id'])) {
56
+    $session_id = intval($_REQUEST['session_id']);
57
+} else {
58
+    $session_id = 0;
59
+}
52 60
 
53 61
 if (empty($session_id)) {
54 62
 	$session_id = key($my_session_list);
Please login to merge, or discard this patch.
main/tracking/question_course_report.php 2 patches
Indentation   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -14,20 +14,20 @@  discard block
 block discarded – undo
14 14
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
15 15
 
16 16
 if (!$is_allowedToTrack) {
17
-	Display :: display_header(null);
18
-	api_not_allowed();
19
-	Display :: display_footer();
17
+    Display :: display_header(null);
18
+    api_not_allowed();
19
+    Display :: display_footer();
20 20
 }
21 21
 
22 22
 $export_to_xls = false;
23 23
 if (isset($_GET['export'])) {
24
-	$export_to_xls = true;
24
+    $export_to_xls = true;
25 25
 }
26 26
 
27 27
 if (api_is_platform_admin() ) {
28
-	$global = true;
28
+    $global = true;
29 29
 } else {
30
-	$global = false;
30
+    $global = false;
31 31
 }
32 32
 $global = true;
33 33
 
@@ -45,14 +45,14 @@  discard block
 block discarded – undo
45 45
 $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null;
46 46
 
47 47
 if (empty($session_id)) {
48
-	$temp_course_list = CourseManager :: get_courses_list();
48
+    $temp_course_list = CourseManager :: get_courses_list();
49 49
 } else {
50
-	$temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
50
+    $temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
51 51
 }
52 52
 
53 53
 foreach ($temp_course_list  as $temp_course_item) {
54
-	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
54
+    $course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
+    $course_select_list[$temp_course_item['code']]	= $course_item['title'];
56 56
 }
57 57
 
58 58
 //Get session list
@@ -95,132 +95,132 @@  discard block
 block discarded – undo
95 95
 $course_info = api_get_course_info($course_code);
96 96
 
97 97
 if (!empty($course_info)) {
98
-	$list = new LearnpathList('', $course_code);
99
-	$lp_list = $list->get_flat_list();
98
+    $list = new LearnpathList('', $course_code);
99
+    $lp_list = $list->get_flat_list();
100 100
 
101
-	$main_question_list = array();
101
+    $main_question_list = array();
102 102
 
103
-	foreach ($lp_list as $lp_id => $lp) {
103
+    foreach ($lp_list as $lp_id => $lp) {
104 104
         $exercise_list = Event::get_all_exercises_from_lp(
105 105
             $lp_id,
106 106
             $course_info['real_id']
107 107
         );
108 108
 
109
-		foreach ($exercise_list as $exercise) {
110
-			$my_exercise = new Exercise($course_info['real_id']);
111
-			$my_exercise->read($exercise['path']);
112
-			$question_list = $my_exercise->selectQuestionList();
113
-
114
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
115
-				$exercise['path'],
116
-				$course_info['real_id'],
117
-				$session_id
118
-			);
119
-
120
-			foreach ($question_list as $question_id) {
121
-				$question_data = Question::read($question_id);
122
-				$main_question_list[$question_id] = $question_data;
123
-				$quantity_exercises = 0;
124
-				$question_result = 0;
125
-
126
-				foreach ($exercise_stats as $stats) {
127
-					if (!empty($stats['question_list'])) {
128
-						foreach($stats['question_list'] as $my_question_stat) {
129
-							if ($question_id == $my_question_stat['question_id']) {
130
-								$question_result =  $question_result + $my_question_stat['marks'];
131
-								$quantity_exercises++;
132
-							}
133
-						}
134
-					}
135
-				}
136
-
137
-				if (!empty($quantity_exercises)) {
138
-					// Score % average
139
-					$main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
-				} else {
141
-					$main_question_list[$question_id]->results = 0;
142
-				}
143
-
144
-				$main_question_list[$question_id]->quantity = $quantity_exercises;
145
-			}
146
-		}
147
-	}
109
+        foreach ($exercise_list as $exercise) {
110
+            $my_exercise = new Exercise($course_info['real_id']);
111
+            $my_exercise->read($exercise['path']);
112
+            $question_list = $my_exercise->selectQuestionList();
113
+
114
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
115
+                $exercise['path'],
116
+                $course_info['real_id'],
117
+                $session_id
118
+            );
119
+
120
+            foreach ($question_list as $question_id) {
121
+                $question_data = Question::read($question_id);
122
+                $main_question_list[$question_id] = $question_data;
123
+                $quantity_exercises = 0;
124
+                $question_result = 0;
125
+
126
+                foreach ($exercise_stats as $stats) {
127
+                    if (!empty($stats['question_list'])) {
128
+                        foreach($stats['question_list'] as $my_question_stat) {
129
+                            if ($question_id == $my_question_stat['question_id']) {
130
+                                $question_result =  $question_result + $my_question_stat['marks'];
131
+                                $quantity_exercises++;
132
+                            }
133
+                        }
134
+                    }
135
+                }
136
+
137
+                if (!empty($quantity_exercises)) {
138
+                    // Score % average
139
+                    $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
+                } else {
141
+                    $main_question_list[$question_id]->results = 0;
142
+                }
143
+
144
+                $main_question_list[$question_id]->quantity = $quantity_exercises;
145
+            }
146
+        }
147
+    }
148 148
 }
149 149
 
150 150
 if (!$export_to_xls) {
151
-	Display :: display_header(get_lang("MySpace"));
152
-	echo '<div class="actions">';
153
-	if ($global) {
154
-		echo MySpace::getTopMenu();
155
-	} else {
156
-		echo '<div style="float:left; clear:left">
151
+    Display :: display_header(get_lang("MySpace"));
152
+    echo '<div class="actions">';
153
+    if ($global) {
154
+        echo MySpace::getTopMenu();
155
+    } else {
156
+        echo '<div style="float:left; clear:left">
157 157
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.
158 158
                     get_lang('StudentsTracking').'</a>&nbsp;|
159 159
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.
160 160
                     get_lang('CourseTracking').'</a>&nbsp;';
161
-		echo '</div>';
162
-	}
163
-	echo '</div>';
161
+        echo '</div>';
162
+    }
163
+    echo '</div>';
164 164
 
165
-	if (api_is_platform_admin()) {
166
-		echo MySpace::getAdminActions();
167
-	}
168
-	echo '<br />';
169
-	echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
165
+    if (api_is_platform_admin()) {
166
+        echo MySpace::getAdminActions();
167
+    }
168
+    echo '<br />';
169
+    echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
170 170
 
171
-	$form->display();
171
+    $form->display();
172 172
 
173
-	if (empty($course_code)) {
174
-		Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
-	}
173
+    if (empty($course_code)) {
174
+        Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
+    }
176 176
 }
177 177
 
178 178
 $course_average = array();
179 179
 $counter = 0;
180 180
 
181 181
 if (!empty($main_question_list) && is_array($main_question_list)) {
182
-	$html_result .= '<table  class="data_table">';
183
-	$html_result .= '<tr><th>'.get_lang('Question').
182
+    $html_result .= '<table  class="data_table">';
183
+    $html_result .= '<tr><th>'.get_lang('Question').
184 184
                     Display :: return_icon('info3.gif', get_lang('QuestionsAreTakenFromLPExercises'), array('align' => 'absmiddle', 'hspace' => '3px')).'</th>';
185
-	$html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
-	$html_result .= '<th>'.get_lang('Quantity').'</th>';
187
-
188
-	foreach ($main_question_list as $question) {
189
-		$total_student = 0;
190
-		$counter ++;
191
-		$s_css_class = 'row_even';
192
-		if ($counter % 2 ==0 ) {
193
-			$s_css_class = 'row_odd';
194
-		}
195
-		$html_result .= "<tr class='$s_css_class'>
185
+    $html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
+    $html_result .= '<th>'.get_lang('Quantity').'</th>';
187
+
188
+    foreach ($main_question_list as $question) {
189
+        $total_student = 0;
190
+        $counter ++;
191
+        $s_css_class = 'row_even';
192
+        if ($counter % 2 ==0 ) {
193
+            $s_css_class = 'row_odd';
194
+        }
195
+        $html_result .= "<tr class='$s_css_class'>
196 196
 							<td >";
197
-		$question_title = trim($question->question);
198
-		if (empty($question_title)) {
199
-			$html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
-		} else {
201
-			$html_result .= $question->question;
202
-		}
203
-
204
-		$html_result .= "</td>";
205
-		$html_result .= "<td>";
206
-		$html_result .= round($question->results, 2).' / '.$question->weighting;
207
-		$html_result .= "</td>";
208
-
209
-		$html_result .= "<td>";
210
-		$html_result .= $question->quantity;
211
-		$html_result .= "</td>";
212
-	}
213
-
214
-	$html_result .="</tr>";
215
-	$html_result .= '</table>';
197
+        $question_title = trim($question->question);
198
+        if (empty($question_title)) {
199
+            $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
+        } else {
201
+            $html_result .= $question->question;
202
+        }
203
+
204
+        $html_result .= "</td>";
205
+        $html_result .= "<td>";
206
+        $html_result .= round($question->results, 2).' / '.$question->weighting;
207
+        $html_result .= "</td>";
208
+
209
+        $html_result .= "<td>";
210
+        $html_result .= $question->quantity;
211
+        $html_result .= "</td>";
212
+    }
213
+
214
+    $html_result .="</tr>";
215
+    $html_result .= '</table>';
216 216
 } else {
217
-	if (!empty($course_code)) {
218
-		Display::display_warning_message(get_lang('NoResults'));
219
-	}
217
+    if (!empty($course_code)) {
218
+        Display::display_warning_message(get_lang('NoResults'));
219
+    }
220 220
 }
221 221
 
222 222
 if (!$export_to_xls) {
223
-	echo $html_result;
223
+    echo $html_result;
224 224
 }
225 225
 
226 226
 Display :: display_footer();
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	$export_to_xls = true;
25 25
 }
26 26
 
27
-if (api_is_platform_admin() ) {
27
+if (api_is_platform_admin()) {
28 28
 	$global = true;
29 29
 } else {
30 30
 	$global = false;
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
 foreach ($temp_course_list  as $temp_course_item) {
54 54
 	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
55
+	$course_select_list[$temp_course_item['code']] = $course_item['title'];
56 56
 }
57 57
 
58 58
 //Get session list
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     $course_code = 0;
91 91
 }
92 92
 
93
-$form->setDefaults(array('course_code'=>(string)$course_code));
93
+$form->setDefaults(array('course_code'=>(string) $course_code));
94 94
 
95 95
 $course_info = api_get_course_info($course_code);
96 96
 
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 
126 126
 				foreach ($exercise_stats as $stats) {
127 127
 					if (!empty($stats['question_list'])) {
128
-						foreach($stats['question_list'] as $my_question_stat) {
128
+						foreach ($stats['question_list'] as $my_question_stat) {
129 129
 							if ($question_id == $my_question_stat['question_id']) {
130
-								$question_result =  $question_result + $my_question_stat['marks'];
130
+								$question_result = $question_result + $my_question_stat['marks'];
131 131
 								$quantity_exercises++;
132 132
 							}
133 133
 						}
@@ -187,9 +187,9 @@  discard block
 block discarded – undo
187 187
 
188 188
 	foreach ($main_question_list as $question) {
189 189
 		$total_student = 0;
190
-		$counter ++;
190
+		$counter++;
191 191
 		$s_css_class = 'row_even';
192
-		if ($counter % 2 ==0 ) {
192
+		if ($counter % 2 == 0) {
193 193
 			$s_css_class = 'row_odd';
194 194
 		}
195 195
 		$html_result .= "<tr class='$s_css_class'>
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		$html_result .= "</td>";
212 212
 	}
213 213
 
214
-	$html_result .="</tr>";
214
+	$html_result .= "</tr>";
215 215
 	$html_result .= '</table>';
216 216
 } else {
217 217
 	if (!empty($course_code)) {
Please login to merge, or discard this patch.
main/tracking/course_access_details.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -61,18 +61,18 @@  discard block
 block discarded – undo
61 61
             $reqdate = time();
62 62
             //** dislayed period
63 63
             echo "<tr><td><b>";
64
-            switch($period) {
64
+            switch ($period) {
65 65
                 case "year" :
66 66
                     echo date(" Y", $reqdate);
67 67
                     break;
68 68
                 case "month" :
69
-                    echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
69
+                    echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
70 70
                     break;
71 71
                 // default == day
72 72
                 default :
73 73
                     $period = "day";
74 74
                 case "day" :
75
-                    echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate);
75
+                    echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
76 76
                     break;
77 77
             }
78 78
         echo "</b></tr></td>";
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
                 ".get_lang('DetailView')." :
87 87
         ";
88 88
 
89
-        switch($period) {
89
+        switch ($period) {
90 90
             case "year" :
91 91
                 //-- if period is "year" display can be by month, day or hour
92 92
                 echo "  [<a href='".api_get_self()."?period=$period&reqdate=$reqdate&displayType=month' class='specialLink'>".get_lang('PeriodMonth')."</a>]";
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
             case "year" :
106 106
                 // previous and next date must be evaluated
107 107
                 // 30 days should be a good approximation
108
-                $previousReqDate = mktime(1,1,1,1,1,date("Y",$reqdate)-1);
109
-                $nextReqDate = mktime(1,1,1,1,1,date("Y",$reqdate)+1);
108
+                $previousReqDate = mktime(1, 1, 1, 1, 1, date("Y", $reqdate) - 1);
109
+                $nextReqDate = mktime(1, 1, 1, 1, 1, date("Y", $reqdate) + 1);
110 110
                 echo   "
111 111
                     [<a href='".api_get_self()."?period=$period&reqdate=$previousReqDate&displayType=$displayType' class='specialLink'>".get_lang('PreviousYear')."</a>]
112 112
                     [<a href='".api_get_self()."?period=$period&reqdate=$nextReqDate&displayType=$displayType' class='specialLink'>".get_lang('NextYear')."</a>]
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
             case "month" :
116 116
                 // previous and next date must be evaluated
117 117
                 // 30 days should be a good approximation
118
-                $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate));
119
-                $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate));
118
+                $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
119
+                $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
120 120
                 echo   "
121 121
                     [<a href='".api_get_self()."?period=$period&reqdate=$previousReqDate&displayType=$displayType' class='specialLink'>".get_lang('PreviousMonth')."</a>]
122 122
                     [<a href='".api_get_self()."?period=$period&reqdate=$nextReqDate&displayType=$displayType' class='specialLink'>".get_lang('NextMonth')."</a>]
@@ -145,16 +145,16 @@  discard block
 block discarded – undo
145 145
                 if ($displayType == "month") {
146 146
                     $sql .= "ORDER BY UNIX_TIMESTAMP( access_date)";
147 147
                     $month_array = StatsUtils::monthTab($sql);
148
-                    StatsUtils::makeHitsTable($month_array,get_lang('PeriodMonth'));
149
-                } elseif($displayType == "day") {
148
+                    StatsUtils::makeHitsTable($month_array, get_lang('PeriodMonth'));
149
+                } elseif ($displayType == "day") {
150 150
                     $sql .= "ORDER BY DAYOFYEAR( access_date)";
151 151
                     $days_array = StatsUtils::daysTab($sql);
152
-                    StatsUtils::makeHitsTable($days_array,get_lang('PeriodDay'));
152
+                    StatsUtils::makeHitsTable($days_array, get_lang('PeriodDay'));
153 153
                 } else {
154 154
                     // by hours by default
155 155
                     $sql .= "ORDER BY HOUR( access_date)";
156 156
                     $hours_array = StatsUtils::hoursTab($sql);
157
-                    StatsUtils::makeHitsTable($hours_array,get_lang('PeriodHour'));
157
+                    StatsUtils::makeHitsTable($hours_array, get_lang('PeriodHour'));
158 158
                 }
159 159
                 break;
160 160
             // all days
@@ -168,12 +168,12 @@  discard block
 block discarded – undo
168 168
                 if ($displayType == "day") {
169 169
                     $sql .= "ORDER BY DAYOFYEAR( access_date)";
170 170
                     $days_array = StatsUtils::daysTab($sql);
171
-                    StatsUtils::makeHitsTable($days_array,get_lang('PeriodDay'));
171
+                    StatsUtils::makeHitsTable($days_array, get_lang('PeriodDay'));
172 172
                 } else {
173 173
                     // by hours by default
174 174
                     $sql .= "ORDER BY HOUR( access_date)";
175 175
                     $hours_array = StatsUtils::hoursTab($sql);
176
-                    StatsUtils:: makeHitsTable($hours_array,get_lang('PeriodHour'));
176
+                    StatsUtils:: makeHitsTable($hours_array, get_lang('PeriodHour'));
177 177
                 }
178 178
                 break;
179 179
             // all hours
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
                         AND c_id = $courseId
187 187
                         AND access_tool IS NULL
188 188
                         ORDER BY HOUR( access_date )";
189
-                $hours_array = StatsUtils::hoursTab($sql,$reqdate);
190
-                StatsUtils::makeHitsTable($hours_array,get_lang('PeriodHour'));
189
+                $hours_array = StatsUtils::hoursTab($sql, $reqdate);
190
+                StatsUtils::makeHitsTable($hours_array, get_lang('PeriodHour'));
191 191
                 break;
192 192
         }
193 193
     } else {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,9 @@
 block discarded – undo
57 57
 <table width="100%" cellpadding="2" cellspacing="3" border="0">
58 58
 <?php
59 59
     if ($is_allowedToTrack) {
60
-        if (!isset($reqdate) || $reqdate < 0 || $reqdate > 2149372861)
61
-            $reqdate = time();
60
+        if (!isset($reqdate) || $reqdate < 0 || $reqdate > 2149372861) {
61
+                    $reqdate = time();
62
+        }
62 63
             //** dislayed period
63 64
             echo "<tr><td><b>";
64 65
             switch($period) {
Please login to merge, or discard this patch.