@@ -558,7 +558,7 @@ |
||
558 | 558 | $my_api_cidreq = 'cidReq=' . $my_category['course_code']; |
559 | 559 | } |
560 | 560 | if ($show_add_link && !$message_resource) { |
561 | - $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' . |
|
561 | + $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' . |
|
562 | 562 | Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>'; |
563 | 563 | $cats = Category :: load($selectcat); |
564 | 564 |
@@ -194,13 +194,13 @@ discard block |
||
194 | 194 | in exercice/exercice.php, look for note-query-exe-results marker*/ |
195 | 195 | $session_id = api_get_session_id(); |
196 | 196 | $courseId = $this->getCourseId(); |
197 | - $exercise = new Exercise($courseId); |
|
197 | + $exercise = new Exercise($courseId); |
|
198 | 198 | $exercise->read($this->get_ref_id()); |
199 | 199 | |
200 | 200 | if (!$this->is_hp) { |
201 | 201 | |
202 | - if ($exercise->exercise_was_added_in_lp == false) { |
|
203 | - $sql = "SELECT * FROM $tblStats |
|
202 | + if ($exercise->exercise_was_added_in_lp == false) { |
|
203 | + $sql = "SELECT * FROM $tblStats |
|
204 | 204 | WHERE |
205 | 205 | exe_exo_id = ".intval($this->get_ref_id())." AND |
206 | 206 | orig_lp_id = 0 AND |
@@ -209,15 +209,15 @@ discard block |
||
209 | 209 | session_id = $session_id AND |
210 | 210 | c_id = $courseId |
211 | 211 | "; |
212 | - } else { |
|
213 | - $lpId = null; |
|
214 | - if (!empty($exercise->lpList)) { |
|
215 | - // Taking only the first LP |
|
216 | - $lpId = current($exercise->lpList); |
|
217 | - $lpId = $lpId['lp_id']; |
|
218 | - } |
|
219 | - |
|
220 | - $sql = "SELECT * FROM $tblStats |
|
212 | + } else { |
|
213 | + $lpId = null; |
|
214 | + if (!empty($exercise->lpList)) { |
|
215 | + // Taking only the first LP |
|
216 | + $lpId = current($exercise->lpList); |
|
217 | + $lpId = $lpId['lp_id']; |
|
218 | + } |
|
219 | + |
|
220 | + $sql = "SELECT * FROM $tblStats |
|
221 | 221 | WHERE |
222 | 222 | exe_exo_id = ".intval($this->get_ref_id())." AND |
223 | 223 | orig_lp_id = $lpId AND |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | session_id = $session_id AND |
226 | 226 | c_id = $courseId |
227 | 227 | "; |
228 | - } |
|
228 | + } |
|
229 | 229 | |
230 | 230 | if (!empty($stud_id) && $type != 'ranking') { |
231 | 231 | $sql .= " AND exe_user_id = $stud_id "; |
@@ -8,16 +8,16 @@ |
||
8 | 8 | */ |
9 | 9 | interface GradebookItem |
10 | 10 | { |
11 | - public function get_item_type(); |
|
12 | - public function get_id(); |
|
13 | - public function get_name(); |
|
14 | - public function get_description(); |
|
15 | - public function get_course_code(); |
|
16 | - public function get_weight(); |
|
17 | - public function get_date(); |
|
18 | - public function is_visible(); |
|
19 | - public function get_icon_name(); |
|
20 | - public function getStudentList(); |
|
21 | - public function setStudentList($list); |
|
22 | - public function calc_score($stud_id = null, $type = null); |
|
11 | + public function get_item_type(); |
|
12 | + public function get_id(); |
|
13 | + public function get_name(); |
|
14 | + public function get_description(); |
|
15 | + public function get_course_code(); |
|
16 | + public function get_weight(); |
|
17 | + public function get_date(); |
|
18 | + public function is_visible(); |
|
19 | + public function get_icon_name(); |
|
20 | + public function getStudentList(); |
|
21 | + public function setStudentList($list); |
|
22 | + public function calc_score($stud_id = null, $type = null); |
|
23 | 23 | } |
@@ -1571,7 +1571,6 @@ discard block |
||
1571 | 1571 | * @param string $course_code Course code (optional) |
1572 | 1572 | * @param int $session_id Session ID (optional) |
1573 | 1573 | * @param bool $order |
1574 | - |
|
1575 | 1574 | * @return array Array of subcategories |
1576 | 1575 | */ |
1577 | 1576 | public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null) |
@@ -1850,7 +1849,6 @@ discard block |
||
1850 | 1849 | * This function, locks a category , only one who can unlock it is |
1851 | 1850 | * the platform administrator. |
1852 | 1851 | * @param int locked 1 or unlocked 0 |
1853 | - |
|
1854 | 1852 | * @return bool |
1855 | 1853 | * */ |
1856 | 1854 | public function lock($locked) |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), |
81 | 81 | array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'), |
82 | 82 | array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false') |
83 | - ); |
|
83 | + ); |
|
84 | 84 | //Autowidth |
85 | 85 | $extra_params['autowidth'] = 'true'; |
86 | 86 | //height auto |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | //With this function we can add actions to the jgrid (edit, delete, etc) |
90 | 90 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
91 | 91 | return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
92 | - ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
93 | - '\'; |
|
92 | + ' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
93 | + '\'; |
|
94 | 94 | }'; |
95 | 95 | ?> |
96 | 96 | <script> |
@@ -87,7 +87,7 @@ |
||
87 | 87 | <?php |
88 | 88 | echo Display::get_alphabet_options($firstLetterUserGroup); |
89 | 89 | echo Display::get_numeric_options(0, 9, $firstLetterUserGroup); |
90 | - ?> |
|
90 | + ?> |
|
91 | 91 | </select> |
92 | 92 | </td> |
93 | 93 | <td width="20%"> </td> |
@@ -229,31 +229,31 @@ discard block |
||
229 | 229 | <td align="center"> |
230 | 230 | <div id="content_source"> |
231 | 231 | <?php |
232 | - if (!($add_type=='multiple')) { |
|
232 | + if (!($add_type=='multiple')) { |
|
233 | 233 | ?> |
234 | 234 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
235 | 235 | <div id="ajax_list_users_single"></div> |
236 | 236 | <?php |
237 | - } else { |
|
238 | - ?> |
|
237 | + } else { |
|
238 | + ?> |
|
239 | 239 | <div id="ajax_list_multiple"> |
240 | 240 | <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?> |
241 | 241 | </div> |
242 | 242 | <?php |
243 | - } |
|
244 | - ?> |
|
243 | + } |
|
244 | + ?> |
|
245 | 245 | </div> |
246 | 246 | </td> |
247 | 247 | <td width="10%" valign="middle" align="center"> |
248 | 248 | <?php |
249 | - if ($ajax_search) { |
|
250 | - ?> |
|
249 | + if ($ajax_search) { |
|
250 | + ?> |
|
251 | 251 | <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" > |
252 | 252 | <em class="fa fa-arrow-left"></em> |
253 | 253 | </button> |
254 | 254 | <?php |
255 | - } else { |
|
256 | - ?> |
|
255 | + } else { |
|
256 | + ?> |
|
257 | 257 | <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))"> |
258 | 258 | <em class="fa fa-arrow-right"></em> |
259 | 259 | </button> |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | <em class="fa fa-arrow-left"></em> |
263 | 263 | </button> |
264 | 264 | <?php |
265 | - } |
|
266 | - ?> |
|
265 | + } |
|
266 | + ?> |
|
267 | 267 | <br /><br /><br /><br /><br /><br /> |
268 | 268 | </td> |
269 | 269 | <td align="center"> |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $courses = $course_list; |
47 | 47 | } |
48 | 48 | |
49 | - if (!empty($courses)) { |
|
49 | + if (!empty($courses)) { |
|
50 | 50 | |
51 | 51 | $archiveFile = 'export_courses_list_'.api_get_local_time(); |
52 | 52 | |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | Export::arrayToXls($listToExport, $archiveFile); |
99 | 99 | break; |
100 | 100 | } |
101 | - } else { |
|
101 | + } else { |
|
102 | 102 | Display::addFlash( |
103 | 103 | Display::return_message( |
104 | 104 | get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty') |
105 | 105 | ) |
106 | 106 | ); |
107 | - } |
|
107 | + } |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | |
@@ -114,29 +114,29 @@ discard block |
||
114 | 114 | $form->addHeader($tool_name); |
115 | 115 | $form->addHidden('formSent', 1); |
116 | 116 | $form->addElement( |
117 | - 'radio', |
|
118 | - 'select_type', |
|
119 | - get_lang('Option'), |
|
120 | - get_lang('ExportAllCoursesList'), |
|
121 | - '1', |
|
122 | - ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"] |
|
117 | + 'radio', |
|
118 | + 'select_type', |
|
119 | + get_lang('Option'), |
|
120 | + get_lang('ExportAllCoursesList'), |
|
121 | + '1', |
|
122 | + ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"] |
|
123 | 123 | ); |
124 | 124 | |
125 | 125 | $form->addElement( |
126 | - 'radio', |
|
127 | - 'select_type', |
|
128 | - '', |
|
129 | - get_lang('ExportSelectedCoursesFromCoursesList'), |
|
130 | - '2', |
|
131 | - ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"] |
|
126 | + 'radio', |
|
127 | + 'select_type', |
|
128 | + '', |
|
129 | + get_lang('ExportSelectedCoursesFromCoursesList'), |
|
130 | + '2', |
|
131 | + ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"] |
|
132 | 132 | ); |
133 | 133 | |
134 | 134 | if (!empty($course_list)) { |
135 | - $form->addHtml('<div id="div-course-list" style="display:none">'); |
|
136 | - $coursesInList = []; |
|
137 | - foreach ($course_list as $course) { |
|
138 | - $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')'; |
|
139 | - } |
|
135 | + $form->addHtml('<div id="div-course-list" style="display:none">'); |
|
136 | + $coursesInList = []; |
|
137 | + foreach ($course_list as $course) { |
|
138 | + $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')'; |
|
139 | + } |
|
140 | 140 | |
141 | 141 | $form->addSelect( |
142 | 142 | 'course_code', |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | ['multiple' => 'multiple'] |
146 | 146 | ); |
147 | 147 | |
148 | - $form->addHtml('</div>'); |
|
148 | + $form->addHtml('</div>'); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null); |
@@ -11,58 +11,58 @@ |
||
11 | 11 | */ |
12 | 12 | $nbre=0; |
13 | 13 | echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">'; |
14 | - if($statut==1) |
|
15 | - { |
|
16 | - echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>'; |
|
17 | - } |
|
18 | - else |
|
19 | - { |
|
20 | - echo '<input type="hidden" name="mailling" value="1">'; |
|
21 | - } |
|
14 | + if($statut==1) |
|
15 | + { |
|
16 | + echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>'; |
|
17 | + } |
|
18 | + else |
|
19 | + { |
|
20 | + echo '<input type="hidden" name="mailling" value="1">'; |
|
21 | + } |
|
22 | 22 | if(!empty($course)) |
23 | 23 | { |
24 | - echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">'; |
|
24 | + echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">'; |
|
25 | 25 | } |
26 | 26 | elseif(!empty($id_session)) |
27 | 27 | { |
28 | - echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">'; |
|
28 | + echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">'; |
|
29 | 29 | } |
30 | 30 | $is_western_name_order = api_is_western_name_order(); |
31 | 31 | echo '<input type="hidden" name="confirmed" value="yes">'; |
32 | 32 | echo '<table border="0" cellspacing="0" width="100%">'; |
33 | 33 | echo '<tr align="center" id="header3">' . |
34 | - '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' . |
|
35 | - '<td width="40%"><b>'.get_lang('Email').'</b></td>' . |
|
36 | - ($is_western_name_order |
|
37 | - ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' . |
|
38 | - '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
39 | - : '<td width="15%"><b>'.get_lang('Name').'</b></td>' . |
|
40 | - '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') . |
|
41 | - '<td width="15%"><b>'.get_lang('Login').'</b></td>' . |
|
42 | - '</tr>'."\n"; |
|
34 | + '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' . |
|
35 | + '<td width="40%"><b>'.get_lang('Email').'</b></td>' . |
|
36 | + ($is_western_name_order |
|
37 | + ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' . |
|
38 | + '<td width="15%"><b>'.get_lang('Name').'</b></td>' |
|
39 | + : '<td width="15%"><b>'.get_lang('Name').'</b></td>' . |
|
40 | + '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') . |
|
41 | + '<td width="15%"><b>'.get_lang('Login').'</b></td>' . |
|
42 | + '</tr>'."\n"; |
|
43 | 43 | while (list ($key, $val) = each($nom_form)) { |
44 | - $nbre=$nbre+1; |
|
45 | - if($nbre & 1) $ndiv=2; else $ndiv=3; |
|
46 | - echo '<tr align="center" id="header'.$ndiv.'">'; |
|
47 | - echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
48 | - echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
49 | - if ($is_western_name_order) |
|
50 | - { |
|
51 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
52 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
53 | - } |
|
54 | - else |
|
55 | - { |
|
56 | - echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
57 | - echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
58 | - } |
|
59 | - echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
60 | - echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
61 | - echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
62 | - echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
63 | - echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
64 | - echo '</td>'; |
|
65 | - echo '</tr>'; |
|
44 | + $nbre=$nbre+1; |
|
45 | + if($nbre & 1) $ndiv=2; else $ndiv=3; |
|
46 | + echo '<tr align="center" id="header'.$ndiv.'">'; |
|
47 | + echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>'; |
|
48 | + echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>'; |
|
49 | + if ($is_western_name_order) |
|
50 | + { |
|
51 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
52 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
53 | + } |
|
54 | + else |
|
55 | + { |
|
56 | + echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>'; |
|
57 | + echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>'; |
|
58 | + } |
|
59 | + echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">'; |
|
60 | + echo '<input type="hidden" name="tutor_form['.$key.']" value="0">'; |
|
61 | + echo '<input type="hidden" name="admin_form['.$key.']" value="1">'; |
|
62 | + echo '<input type="hidden" name="password_form['.$key.']" value="'.$password_form[$key].'">'; |
|
63 | + echo '<input type="hidden" name="statut['.$key.']" value="'.$statut.'">'; |
|
64 | + echo '</td>'; |
|
65 | + echo '</tr>'; |
|
66 | 66 | } |
67 | 67 | echo '</table>'; |
68 | 68 | echo '<br />'; |