Completed
Push — 1.11.x ( 6904fa...6a92e6 )
by José
525:44 queued 484:20
created
main/tracking/courseLog.php 1 patch
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.
main/tracking/course_session_report.php 1 patch
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.
main/tracking/question_course_report.php 1 patch
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.
main/install/update-configuration.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40 40
             $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
41
-       } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
41
+        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43 43
             $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
Please login to merge, or discard this patch.
main/course_description/listing.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -18,27 +18,27 @@  discard block
 block discarded – undo
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
22
-	echo '<div class="actions" style="margin-bottom:30px">';
23
-	ksort($categories);
24
-	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
26
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
21
+    $i=1;
22
+    echo '<div class="actions" style="margin-bottom:30px">';
23
+    ksort($categories);
24
+    foreach ($categories as $id => $title) {
25
+        if ($i==ADD_BLOCK) {
26
+            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27 27
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
28
-			break;
29
-		} else {
30
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
28
+            break;
29
+        } else {
30
+            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31 31
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
32
-			$i++;
33
-		}
34
-	}
35
-	echo '</div>';
32
+            $i++;
33
+        }
34
+    }
35
+    echo '</div>';
36 36
 }
37 37
 $history = isset($history) ? $history : null;
38 38
 
39 39
 // display course description list
40 40
 if ($history) {
41
-	echo '<div>
41
+    echo '<div>
42 42
         <table width="100%">
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 $user_info = api_get_user_info();
50 50
 
51 51
 if (isset($descriptions) && count($descriptions) > 0) {
52
-	foreach ($descriptions as $id => $description) {
52
+    foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55 55
             if (api_is_allowed_to_edit(null,true) && !$history) {
Please login to merge, or discard this patch.
main/course_description/edit.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -10,67 +10,67 @@  discard block
 block discarded – undo
10 10
 // protect a course script
11 11
 api_protect_course_script(true);
12 12
 if (empty($id)) {
13
-	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
-	if (empty($id)) {
15
-		// If the ID was not provided, find the first matching description item given the item type
16
-		$course_description = new CourseDescription();
17
-		$description = $course_description->get_data_by_description_type($description_type);
18
-		if (count($description) > 0) {
19
-			$id = $description['id'];
20
-		}
21
-		// If no corresponding description is found, edit a new one
22
-		unset($course_description);
23
-	}
13
+    $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
+    if (empty($id)) {
15
+        // If the ID was not provided, find the first matching description item given the item type
16
+        $course_description = new CourseDescription();
17
+        $description = $course_description->get_data_by_description_type($description_type);
18
+        if (count($description) > 0) {
19
+            $id = $description['id'];
20
+        }
21
+        // If no corresponding description is found, edit a new one
22
+        unset($course_description);
23
+    }
24 24
 }
25 25
 $original_id = $id;
26 26
 
27 27
 if (empty($error)) {
28
-	$token = Security::get_token();
28
+    $token = Security::get_token();
29 29
 }
30 30
 // display categories
31 31
 $categories = array();
32 32
 foreach ($default_description_titles as $id => $title) {
33
-	$categories[$id] = $title;
33
+    $categories[$id] = $title;
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37 37
 $i=1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
-	'</a>';
40
+        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
+    '</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
46
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
-		break;
49
-	} else {
50
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
-		$i++;
53
-	}
45
+    if ($i==ADD_BLOCK) {
46
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
+        break;
49
+    } else {
50
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
+        $i++;
53
+    }
54 54
 }
55 55
 echo '</div>';
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
60 60
 }
61 61
 
62 62
 // default header title form
63 63
 $description_type = intval($description_type);
64 64
 $header = $default_description_titles[$description_type];
65 65
 if ($description_type >= ADD_BLOCK) {
66
-	$header = $default_description_titles[ADD_BLOCK];
66
+    $header = $default_description_titles[ADD_BLOCK];
67 67
 }
68 68
 
69 69
 // display form
70 70
 $form = new FormValidator(
71
-	'course_description',
72
-	'POST',
73
-	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
71
+    'course_description',
72
+    'POST',
73
+    'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
74 74
 );
75 75
 
76 76
 $form->addElement('header','',$header);
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
80 80
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
81 81
 $form->applyFilter('title','html_filter');
82 82
 $form->addHtmlEditor(
83
-	'contentDescription',
84
-	get_lang('Content'),
85
-	true,
86
-	false,
87
-	array(
88
-		'ToolbarSet' => 'TrainingDescription',
89
-		'Width' => '100%',
90
-		'Height' => '200',
91
-	)
83
+    'contentDescription',
84
+    get_lang('Content'),
85
+    true,
86
+    false,
87
+    array(
88
+        'ToolbarSet' => 'TrainingDescription',
89
+        'Width' => '100%',
90
+        'Height' => '200',
91
+    )
92 92
 );
93 93
 $form->addButtonCreate(get_lang('Save'));
94 94
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 $form->setDefaults($default);
105 105
 
106 106
 if (isset ($question[$description_type])) {
107
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
-	$message .= $question[$description_type];
109
-	Display::display_normal_message($message, false);
107
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
+    $message .= $question[$description_type];
109
+    Display::display_normal_message($message, false);
110 110
 }
111 111
 $form->display();
Please login to merge, or discard this patch.
main/course_description/course_description_controller.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                 if (isset($_GET['id_session'])) {
157 157
                     $session_id = intval($_GET['id_session']);
158 158
                 }
159
-		        $course_description_data = $course_description->get_data_by_id(
159
+                $course_description_data = $course_description->get_data_by_id(
160 160
                     $id,
161 161
                     null,
162 162
                     $session_id
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                 $data['description_title'] = $course_description_data['description_title'];
166 166
                 $data['description_content'] = $course_description_data['description_content'];
167 167
                 $data['progress'] = $course_description_data['progress'];
168
-		        $data['descriptions'] = $course_description->get_data_by_description_type(
168
+                $data['descriptions'] = $course_description->get_data_by_description_type(
169 169
                     $description_type,
170 170
                     null,
171 171
                     $session_id
Please login to merge, or discard this patch.
main/user/resume_session.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
     $session_category = '';
61 61
 
62 62
     if (Database::num_rows($rs)>0) {
63
-    	$rows_session_category = Database::store_result($rs);
64
-    	$rows_session_category = $rows_session_category[0];
65
-    	$session_category = $rows_session_category['name'];
63
+        $rows_session_category = Database::store_result($rs);
64
+        $rows_session_category = $rows_session_category[0];
65
+        $session_category = $rows_session_category['name'];
66 66
     }
67 67
 
68 68
     $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -147,22 +147,22 @@  discard block
 block discarded – undo
147 147
     	<td><?php echo get_lang('Date'); ?> :</td>
148 148
     	<td>
149 149
     	<?php
150
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
151
-    		    echo get_lang('NoTimeLimits');
150
+            if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
151
+                echo get_lang('NoTimeLimits');
152 152
             }
153
-    		else {
153
+            else {
154 154
                 if ($session['access_start_date'] != '00-00-0000') {
155
-                	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
155
+                    //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
156 156
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
157 157
                 } else {
158
-                	$session['access_start_date'] = '';
158
+                    $session['access_start_date'] = '';
159 159
                 }
160 160
                 if ($session['access_end_date'] == '00-00-0000') {
161 161
                     $session['access_end_date'] ='';
162 162
                 } else {
163
-                	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
163
+                    $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
164 164
                 }
165
-    			echo $session['access_start_date'].' '.$session['access_end_date'];
165
+                echo $session['access_start_date'].' '.$session['access_end_date'];
166 166
             }
167 167
             ?>
168 168
     	</td>
@@ -221,22 +221,22 @@  discard block
 block discarded – undo
221 221
     </tr>
222 222
     <?php
223 223
     if ($session['nbr_courses'] == 0) {
224
-    	echo '<tr>
224
+        echo '<tr>
225 225
             <td colspan="4">'.get_lang('NoCoursesForThisSession').'</td>
226 226
     		</tr>';
227 227
     } else {
228
-    	// select the courses
229
-    	$sql = "SELECT c.id, code,title,visual_code, nbr_users
228
+        // select the courses
229
+        $sql = "SELECT c.id, code,title,visual_code, nbr_users
230 230
     			FROM $tbl_course c,$tbl_session_rel_course sc
231 231
     			WHERE c.id = sc.c_id
232 232
     			AND	session_id='$id_session'
233 233
     			ORDER BY title";
234
-    	$result=Database::query($sql);
235
-    	$courses=Database::store_result($result);
236
-    	foreach ($courses as $course) {
237
-    		//select the number of users
234
+        $result=Database::query($sql);
235
+        $courses=Database::store_result($result);
236
+        foreach ($courses as $course) {
237
+            //select the number of users
238 238
 
239
-    		$sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
239
+            $sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
240 240
                     WHERE
241 241
                         srcru.user_id = sru.user_id AND
242 242
                         srcru.session_id = sru.session_id AND
@@ -244,49 +244,49 @@  discard block
 block discarded – undo
244 244
                         sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
245 245
                         srcru.session_id = '".intval($id_session)."'";
246 246
 
247
-    		$rs = Database::query($sql);
248
-    		$course['nbr_users'] = Database::result($rs,0,0);
247
+            $rs = Database::query($sql);
248
+            $course['nbr_users'] = Database::result($rs,0,0);
249 249
 
250
-    		// Get coachs of the courses in session
250
+            // Get coachs of the courses in session
251 251
 
252
-    		$sql = "SELECT user.lastname,user.firstname,user.username
252
+            $sql = "SELECT user.lastname,user.firstname,user.username
253 253
     		        FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
254 254
     				WHERE
255 255
     				    session_rcru.user_id = user.user_id AND
256 256
     				    session_rcru.session_id = '".intval($id_session)."' AND
257 257
     				    session_rcru.c_id ='".Database::escape_string($course['id'])."' AND
258 258
     				    session_rcru.status=2";
259
-    		$rs = Database::query($sql);
259
+            $rs = Database::query($sql);
260 260
 
261
-    		$coachs = array();
262
-    		if (Database::num_rows($rs) > 0) {
263
-    			while ($info_coach = Database::fetch_array($rs)) {
261
+            $coachs = array();
262
+            if (Database::num_rows($rs) > 0) {
263
+                while ($info_coach = Database::fetch_array($rs)) {
264 264
                     $coachs[] = api_get_person_name(
265 265
                             $info_coach['firstname'],
266 266
                             $info_coach['lastname']
267 267
                         ).' ('.$info_coach['username'].')';
268
-    			}
269
-    		} else {
270
-    			$coach = get_lang('None');
271
-    		}
272
-
273
-    		if (count($coachs) > 0) {
274
-    			$coach = implode('<br />',$coachs);
275
-    		} else {
276
-    			$coach = get_lang('None');
277
-    		}
278
-
279
-    		$orig_param = '&origin=resume_session';
280
-    		//hide_course_breadcrumb the parameter has been added to hide the
268
+                }
269
+            } else {
270
+                $coach = get_lang('None');
271
+            }
272
+
273
+            if (count($coachs) > 0) {
274
+                $coach = implode('<br />',$coachs);
275
+            } else {
276
+                $coach = get_lang('None');
277
+            }
278
+
279
+            $orig_param = '&origin=resume_session';
280
+            //hide_course_breadcrumb the parameter has been added to hide the
281 281
             // name of the course, that appeared in the default $interbreadcrumb
282
-    		echo '
282
+            echo '
283 283
     		<tr>
284 284
     			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
285 285
     			<td>'.$coach.'</td>
286 286
     			<td>'.$course['nbr_users'].'</td>
287 287
 
288 288
     		</tr>';
289
-    	}
289
+        }
290 290
     }
291 291
     ?>
292 292
     </table>
@@ -307,11 +307,11 @@  discard block
 block discarded – undo
307 307
     <?php
308 308
 
309 309
     if ($session['nbr_users']==0) {
310
-    	echo '<tr>
310
+        echo '<tr>
311 311
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
312 312
     		</tr>';
313 313
     } else {
314
-    	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
314
+        $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
315 315
 
316 316
         if ($multiple_url_is_on) {
317 317
             $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
@@ -329,11 +329,11 @@  discard block
 block discarded – undo
329 329
                     AND su.session_id = ".$id_session.$order_clause;
330 330
         }
331 331
 
332
-    	$result = Database::query($sql);
333
-    	$users  = Database::store_result($result);
332
+        $result = Database::query($sql);
333
+        $users  = Database::store_result($result);
334 334
         // change breadcrumb in destination page
335
-    	$orig_param = '&origin=resume_session&id_session='.$id_session;
336
-    	foreach ($users as $user) {
335
+        $orig_param = '&origin=resume_session&id_session='.$id_session;
336
+        foreach ($users as $user) {
337 337
             $user_link = '';
338 338
             if (!empty($user['user_id'])) {
339 339
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
                 }
351 351
             }
352 352
 
353
-    		echo '<tr>
353
+            echo '<tr>
354 354
                     <td width="90%">
355 355
                         '.$user_link.'
356 356
                     </td>
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
                         '.$link_to_add_user_in_url.'
362 362
                     </td>
363 363
                     </tr>';
364
-    	}
364
+        }
365 365
     }
366 366
     ?>
367 367
     </table>
Please login to merge, or discard this patch.
main/user/session_list.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
         array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
66 66
         array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
67 67
         array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
68
-          //for the bottom bar
68
+            //for the bottom bar
69 69
             'searchoptions' => array(
70 70
                 'defaultValue' => '1',
71 71
                 'value' => '1:'.get_lang('Active').';0:'.get_lang('Inactive')
72 72
             ),
73
-          //for the top bar
74
-          'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
73
+            //for the top bar
74
+            'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
75 75
         array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
76 76
         array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
77 77
     );
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     //With this function we can add actions to the jgrid (edit, delete, etc)
87 87
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
88 88
          return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
89
-         '\';
89
+            '\';
90 90
     }';
91 91
     ?>
92 92
     <script>
Please login to merge, or discard this patch.