@@ -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 | } |
@@ -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); |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | <option value="">--</option> |
| 264 | 264 | <?php |
| 265 | 265 | echo Display :: get_alphabet_options($first_letter_user); |
| 266 | - ?> |
|
| 266 | + ?> |
|
| 267 | 267 | </select> |
| 268 | 268 | </td> |
| 269 | 269 | <td width="20%"> </td> |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | <select name="firstLetterCourse" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();"> |
| 275 | 275 | <option value="">--</option> |
| 276 | 276 | <?php |
| 277 | - echo Display :: get_alphabet_options($first_letter_course); |
|
| 278 | - ?> |
|
| 277 | + echo Display :: get_alphabet_options($first_letter_course); |
|
| 278 | + ?> |
|
| 279 | 279 | </select> |
| 280 | 280 | </td> |
| 281 | 281 | </tr> |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | echo $userName; |
| 298 | - ?> |
|
| 298 | + ?> |
|
| 299 | 299 | </option> |
| 300 | 300 | <?php |
| 301 | 301 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | <option value = "%">--</option> |
| 198 | 198 | <?php |
| 199 | 199 | echo Display :: get_alphabet_options(); |
| 200 | - ?> |
|
| 200 | + ?> |
|
| 201 | 201 | </select> |
| 202 | 202 | </td> |
| 203 | 203 | <td align="center"> </td> |
@@ -207,31 +207,31 @@ discard block |
||
| 207 | 207 | <td align="center"> |
| 208 | 208 | <div id="content_source"> |
| 209 | 209 | <?php |
| 210 | - if (!($add_type=='multiple')) { |
|
| 210 | + if (!($add_type=='multiple')) { |
|
| 211 | 211 | ?> |
| 212 | 212 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
| 213 | 213 | <div id="ajax_list_users_single"></div> |
| 214 | 214 | <?php |
| 215 | - } else { |
|
| 216 | - ?> |
|
| 215 | + } else { |
|
| 216 | + ?> |
|
| 217 | 217 | <div id="ajax_list_multiple"> |
| 218 | 218 | <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?> |
| 219 | 219 | </div> |
| 220 | 220 | <?php |
| 221 | - } |
|
| 222 | - ?> |
|
| 221 | + } |
|
| 222 | + ?> |
|
| 223 | 223 | </div> |
| 224 | 224 | </td> |
| 225 | 225 | <td width="10%" valign="middle" align="center"> |
| 226 | 226 | <?php |
| 227 | - if ($ajax_search) { |
|
| 228 | - ?> |
|
| 227 | + if ($ajax_search) { |
|
| 228 | + ?> |
|
| 229 | 229 | <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" > |
| 230 | 230 | <em class="fa fa-arrow-left"></em> |
| 231 | 231 | </button> |
| 232 | 232 | <?php |
| 233 | - } else { |
|
| 234 | - ?> |
|
| 233 | + } else { |
|
| 234 | + ?> |
|
| 235 | 235 | <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))"> |
| 236 | 236 | <em class="fa fa-arrow-right"></em> |
| 237 | 237 | </button> |
@@ -240,8 +240,8 @@ discard block |
||
| 240 | 240 | <em class="fa fa-arrow-left"></em> |
| 241 | 241 | </button> |
| 242 | 242 | <?php |
| 243 | - } |
|
| 244 | - ?> |
|
| 243 | + } |
|
| 244 | + ?> |
|
| 245 | 245 | <br /><br /><br /><br /><br /><br /> |
| 246 | 246 | </td> |
| 247 | 247 | <td align="center"> |
@@ -112,7 +112,7 @@ |
||
| 112 | 112 | <script> |
| 113 | 113 | $(function() { |
| 114 | 114 | <?php |
| 115 | - echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true); |
|
| 115 | + echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true); |
|
| 116 | 116 | ?> |
| 117 | 117 | }); |
| 118 | 118 | </script> |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | <?php |
| 108 | 108 | echo Display :: get_alphabet_options($first_letter_course); |
| 109 | 109 | echo Display :: get_numeric_options(0,9,$first_letter_course); |
| 110 | - ?> |
|
| 110 | + ?> |
|
| 111 | 111 | </select> |
| 112 | 112 | </td> |
| 113 | 113 | <td width="20%"> </td> |