@@ -783,29 +783,29 @@ |
||
| 783 | 783 | } |
| 784 | 784 | |
| 785 | 785 | /** |
| 786 | - * Return an array of student state answers for fill the blank questions |
|
| 787 | - * for each students that answered the question |
|
| 788 | - * -2 : didn't answer |
|
| 789 | - * -1 : student answer is wrong |
|
| 790 | - * 0 : student answer is correct |
|
| 791 | - * >0 : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0) |
|
| 792 | - * |
|
| 793 | - * @param integer $testId |
|
| 794 | - * @param integer $questionId |
|
| 795 | - * @param $studentsIdList |
|
| 796 | - * @param string $startDate |
|
| 797 | - * @param string $endDate |
|
| 798 | - * @param bool $useLastAnsweredAttempt |
|
| 799 | - * @return array |
|
| 800 | - * ( |
|
| 801 | - * [student_id] => Array |
|
| 802 | - * ( |
|
| 803 | - * [first fill the blank for question] => -1 |
|
| 804 | - * [second fill the blank for question] => 2 |
|
| 805 | - * [third fill the blank for question] => -1 |
|
| 806 | - * ) |
|
| 807 | - * ) |
|
| 808 | - */ |
|
| 786 | + * Return an array of student state answers for fill the blank questions |
|
| 787 | + * for each students that answered the question |
|
| 788 | + * -2 : didn't answer |
|
| 789 | + * -1 : student answer is wrong |
|
| 790 | + * 0 : student answer is correct |
|
| 791 | + * >0 : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0) |
|
| 792 | + * |
|
| 793 | + * @param integer $testId |
|
| 794 | + * @param integer $questionId |
|
| 795 | + * @param $studentsIdList |
|
| 796 | + * @param string $startDate |
|
| 797 | + * @param string $endDate |
|
| 798 | + * @param bool $useLastAnsweredAttempt |
|
| 799 | + * @return array |
|
| 800 | + * ( |
|
| 801 | + * [student_id] => Array |
|
| 802 | + * ( |
|
| 803 | + * [first fill the blank for question] => -1 |
|
| 804 | + * [second fill the blank for question] => 2 |
|
| 805 | + * [third fill the blank for question] => -1 |
|
| 806 | + * ) |
|
| 807 | + * ) |
|
| 808 | + */ |
|
| 809 | 809 | public static function getFillTheBlankTabResult( |
| 810 | 810 | $testId, |
| 811 | 811 | $questionId, |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace')); |
| 20 | 20 | |
| 21 | 21 | if (isset($_GET["id_student"])) { |
| 22 | - $interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students')); |
|
| 22 | + $interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students')); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | Display :: display_header($nameTools); |
@@ -197,25 +197,25 @@ discard block |
||
| 197 | 197 | '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a> |
| 198 | 198 | </td> |
| 199 | 199 | </tr>'; |
| 200 | - } |
|
| 201 | - |
|
| 202 | - if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { |
|
| 203 | - $data[$id_coach]["firstname"] = $firstname; |
|
| 204 | - $data[$id_coach]["lastname"] = $lastname; |
|
| 205 | - } else { |
|
| 206 | - $data[$id_coach]["lastname"] = $lastname; |
|
| 207 | - $data[$id_coach]["firstname"] = $firstname; |
|
| 208 | - } |
|
| 209 | - $data[$id_coach]["connection_time"] = $s_connection_time; |
|
| 210 | - } |
|
| 200 | + } |
|
| 201 | + |
|
| 202 | + if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { |
|
| 203 | + $data[$id_coach]["firstname"] = $firstname; |
|
| 204 | + $data[$id_coach]["lastname"] = $lastname; |
|
| 205 | + } else { |
|
| 206 | + $data[$id_coach]["lastname"] = $lastname; |
|
| 207 | + $data[$id_coach]["firstname"] = $firstname; |
|
| 208 | + } |
|
| 209 | + $data[$id_coach]["connection_time"] = $s_connection_time; |
|
| 210 | + } |
|
| 211 | 211 | } else { |
| 212 | - // No results |
|
| 213 | - echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>'; |
|
| 212 | + // No results |
|
| 213 | + echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>'; |
|
| 214 | 214 | } |
| 215 | 215 | echo '</table>'; |
| 216 | 216 | |
| 217 | 217 | if (isset($_POST['export'])) { |
| 218 | - export_csv($header, $data, 'coaches.csv'); |
|
| 218 | + export_csv($header, $data, 'coaches.csv'); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | echo "<br /><br />"; |
@@ -241,31 +241,31 @@ discard block |
||
| 241 | 241 | <td align="center"> |
| 242 | 242 | <div id="content_source"> |
| 243 | 243 | <?php |
| 244 | - if (!($add_type == 'multiple')) { |
|
| 244 | + if (!($add_type == 'multiple')) { |
|
| 245 | 245 | ?> |
| 246 | 246 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
| 247 | 247 | <div id="ajax_list_users_single"></div> |
| 248 | 248 | <?php |
| 249 | - } else { |
|
| 250 | - ?> |
|
| 249 | + } else { |
|
| 250 | + ?> |
|
| 251 | 251 | <div id="ajax_list_multiple"> |
| 252 | 252 | <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_not_in', 'size'=>'15px'), false); ?> |
| 253 | 253 | </div> |
| 254 | 254 | <?php |
| 255 | - } |
|
| 256 | - ?> |
|
| 255 | + } |
|
| 256 | + ?> |
|
| 257 | 257 | </div> |
| 258 | 258 | </td> |
| 259 | 259 | <td width="10%" valign="middle" align="center"> |
| 260 | 260 | <?php |
| 261 | - if ($ajax_search) { |
|
| 262 | - ?> |
|
| 261 | + if ($ajax_search) { |
|
| 262 | + ?> |
|
| 263 | 263 | <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" > |
| 264 | 264 | <em class="fa fa-arrow-left"></em> |
| 265 | 265 | </button> |
| 266 | 266 | <?php |
| 267 | - } else { |
|
| 268 | - ?> |
|
| 267 | + } else { |
|
| 268 | + ?> |
|
| 269 | 269 | <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'))"> |
| 270 | 270 | <em class="fa fa-arrow-right"></em> |
| 271 | 271 | </button> |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | <em class="fa fa-arrow-left"></em> |
| 275 | 275 | </button> |
| 276 | 276 | <?php |
| 277 | - } |
|
| 278 | - ?> |
|
| 277 | + } |
|
| 278 | + ?> |
|
| 279 | 279 | <br /><br /><br /><br /><br /><br /> |
| 280 | 280 | </td> |
| 281 | 281 | <td align="center"> |
@@ -24,16 +24,16 @@ |
||
| 24 | 24 | $lang_match = $chamilo_langs[get_preferred_language($available_langs)]; |
| 25 | 25 | // recover previous value ... |
| 26 | 26 | if (isset($_SESSION['user_language_choice'])) { |
| 27 | - $lang_match = $_SESSION['user_language_choice']; |
|
| 27 | + $lang_match = $_SESSION['user_language_choice']; |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // Chamilo parameter, on logout |
| 31 | 31 | if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) { |
| 32 | - $lang_match = $_REQUEST['language']; |
|
| 32 | + $lang_match = $_REQUEST['language']; |
|
| 33 | 33 | } |
| 34 | 34 | // Incoming link parameter |
| 35 | 35 | if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) { |
| 36 | - $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
| 36 | + $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | $detect = api_get_setting('auto_detect_language_custom_pages'); |
@@ -267,7 +267,7 @@ |
||
| 267 | 267 | break; |
| 268 | 268 | case RESULT_DISABLE_SHOW_SCORE_ONLY: |
| 269 | 269 | if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) { |
| 270 | - $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
| 270 | + $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
| 271 | 271 | } else { |
| 272 | 272 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details')); |
| 273 | 273 | } |
@@ -136,11 +136,11 @@ discard block |
||
| 136 | 136 | */ |
| 137 | 137 | private $lastSyncType; |
| 138 | 138 | |
| 139 | - /** |
|
| 140 | - * @var string |
|
| 141 | - * |
|
| 142 | - * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false) |
|
| 143 | - */ |
|
| 139 | + /** |
|
| 140 | + * @var string |
|
| 141 | + * |
|
| 142 | + * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false) |
|
| 143 | + */ |
|
| 144 | 144 | private $sslPubKey; |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -530,12 +530,12 @@ discard block |
||
| 530 | 530 | return $this->sslPubKey; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | - /** |
|
| 534 | - * Set sslPubKey |
|
| 535 | - * |
|
| 536 | - * @param string $branchType |
|
| 537 | - * @return BranchSync |
|
| 538 | - */ |
|
| 533 | + /** |
|
| 534 | + * Set sslPubKey |
|
| 535 | + * |
|
| 536 | + * @param string $branchType |
|
| 537 | + * @return BranchSync |
|
| 538 | + */ |
|
| 539 | 539 | public function setBranchType($branchType) |
| 540 | 540 | { |
| 541 | 541 | $this->branchType = $branchType; |
@@ -120,12 +120,12 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if ($add_type == 'multiple') { |
| 123 | - $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'. |
|
| 123 | + $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'. |
|
| 124 | 124 | get_lang('SessionAddTypeUnique').'</a>'; |
| 125 | - $link_add_type_multiple = get_lang('SessionAddTypeMultiple'); |
|
| 125 | + $link_add_type_multiple = get_lang('SessionAddTypeMultiple'); |
|
| 126 | 126 | } else { |
| 127 | - $link_add_type_unique = get_lang('SessionAddTypeUnique'); |
|
| 128 | - $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'. |
|
| 127 | + $link_add_type_unique = get_lang('SessionAddTypeUnique'); |
|
| 128 | + $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'. |
|
| 129 | 129 | get_lang('SessionAddTypeMultiple').'</a>'; |
| 130 | 130 | } |
| 131 | 131 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | } else { |
| 229 | 229 | echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
| 230 | 230 | } |
| 231 | - ?> |
|
| 231 | + ?> |
|
| 232 | 232 | </td> |
| 233 | 233 | </tr> |
| 234 | 234 | </table> |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | // Access restrictions. |
| 26 | 26 | api_protect_admin_script(); |
| 27 | 27 | |
| 28 | - // Submit stylesheets. |
|
| 28 | + // Submit stylesheets. |
|
| 29 | 29 | if (isset($_POST['save']) && isset($_GET['category']) && $_GET['category'] === 'Stylesheets') { |
| 30 | 30 | storeStylesheets(); |
| 31 | 31 | Display::addFlash(Display::return_message(get_lang('Saved'))); |
@@ -29,11 +29,11 @@ |
||
| 29 | 29 | krsort($langs, SORT_NUMERIC); |
| 30 | 30 | // Choosing the best match |
| 31 | 31 | foreach ($langs as $weight => $codes) { |
| 32 | - foreach ($codes as $code) { |
|
| 33 | - if (in_array($code, $available_langs)) { |
|
| 34 | - return $code; |
|
| 35 | - } |
|
| 36 | - } |
|
| 32 | + foreach ($codes as $code) { |
|
| 33 | + if (in_array($code, $available_langs)) { |
|
| 34 | + return $code; |
|
| 35 | + } |
|
| 36 | + } |
|
| 37 | 37 | } |
| 38 | 38 | // No match |
| 39 | 39 | return null; |