@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace')); |
| 19 | 19 | $id_session = ''; |
| 20 | 20 | if (isset($_GET['id_session']) && $_GET['id_session'] != '') { |
| 21 | - $id_session = intval($_GET['id_session']); |
|
| 22 | - $interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions')); |
|
| 23 | - $interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course')); |
|
| 21 | + $id_session = intval($_GET['id_session']); |
|
| 22 | + $interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions')); |
|
| 23 | + $interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course')); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | // Set this option to true to enforce strict purification for usenames. |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | Display :: display_header($tool_name); |
| 90 | 90 | |
| 91 | 91 | if ($_FILES['import_file']['size'] == 0 && $_POST) { |
| 92 | - echo Display::return_message(get_lang('ThisFieldIsRequired'), 'error'); |
|
| 92 | + echo Display::return_message(get_lang('ThisFieldIsRequired'), 'error'); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | if (count($errors) != 0) { |
@@ -33,36 +33,36 @@ |
||
| 33 | 33 | $result_course = Database::query($sql_course); |
| 34 | 34 | |
| 35 | 35 | if (Database::num_rows($result_course) > 0) { |
| 36 | - if (isset($_POST['export'])) { |
|
| 37 | - $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet. |
|
| 38 | - echo Display::return_message($export_result, 'error'); |
|
| 39 | - } |
|
| 40 | - echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>'; |
|
| 41 | - $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', '')); |
|
| 42 | - while ($a_course = Database::fetch_array($result_course)) { |
|
| 43 | - // TODO: This query is to be checked, there are no HotPotatoes tests results. |
|
| 44 | - $sql_moy_test = "SELECT exe_result,exe_weighting |
|
| 36 | + if (isset($_POST['export'])) { |
|
| 37 | + $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet. |
|
| 38 | + echo Display::return_message($export_result, 'error'); |
|
| 39 | + } |
|
| 40 | + echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>'; |
|
| 41 | + $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', '')); |
|
| 42 | + while ($a_course = Database::fetch_array($result_course)) { |
|
| 43 | + // TODO: This query is to be checked, there are no HotPotatoes tests results. |
|
| 44 | + $sql_moy_test = "SELECT exe_result,exe_weighting |
|
| 45 | 45 | FROM $tbl_track_exercice |
| 46 | 46 | WHERE c_id = ".$a_course['id']; |
| 47 | - $result_moy_test = Database::query($sql_moy_test); |
|
| 48 | - $result = 0; |
|
| 49 | - $weighting = 0; |
|
| 50 | - while ($moy_test = Database::fetch_array($result_moy_test)) { |
|
| 51 | - $result = $result + $moy_test['exe_result']; |
|
| 52 | - $weighting = $weighting + $moy_test['exe_weighting']; |
|
| 53 | - } |
|
| 54 | - if ($weighting != 0) { |
|
| 55 | - $moyenne_test = round(($result * 100) / $weighting); |
|
| 56 | - } else { |
|
| 57 | - $moyenne_test = null; |
|
| 58 | - } |
|
| 59 | - echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>'; |
|
| 60 | - } |
|
| 61 | - echo '</table>'; |
|
| 62 | - echo "<br /><br />"; |
|
| 63 | - echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>"; |
|
| 47 | + $result_moy_test = Database::query($sql_moy_test); |
|
| 48 | + $result = 0; |
|
| 49 | + $weighting = 0; |
|
| 50 | + while ($moy_test = Database::fetch_array($result_moy_test)) { |
|
| 51 | + $result = $result + $moy_test['exe_result']; |
|
| 52 | + $weighting = $weighting + $moy_test['exe_weighting']; |
|
| 53 | + } |
|
| 54 | + if ($weighting != 0) { |
|
| 55 | + $moyenne_test = round(($result * 100) / $weighting); |
|
| 56 | + } else { |
|
| 57 | + $moyenne_test = null; |
|
| 58 | + } |
|
| 59 | + echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>'; |
|
| 60 | + } |
|
| 61 | + echo '</table>'; |
|
| 62 | + echo "<br /><br />"; |
|
| 63 | + echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>"; |
|
| 64 | 64 | } else { |
| 65 | - echo get_lang('NoCourse'); |
|
| 65 | + echo get_lang('NoCourse'); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | Display :: display_footer(); |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | if (isset($_POST['number_of_groups'])) { |
| 80 | 80 | if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) { |
| 81 | 81 | echo Display::return_message( |
| 82 | - get_lang('PleaseEnterValidNumber').'<br /><br /> |
|
| 82 | + get_lang('PleaseEnterValidNumber').'<br /><br /> |
|
| 83 | 83 | <a href="group_creation.php?'.api_get_cidreq().'">« '.get_lang('Back').'</a>', |
| 84 | 84 | 'error', |
| 85 | - false |
|
| 86 | - ); |
|
| 85 | + false |
|
| 86 | + ); |
|
| 87 | 87 | } else { |
| 88 | 88 | $number_of_groups = intval($_POST['number_of_groups']); |
| 89 | 89 | if ($number_of_groups > 1) { |
@@ -121,20 +121,20 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | </script> |
| 123 | 123 | <?php |
| 124 | - } |
|
| 125 | - $group_categories = GroupManager::get_categories(); |
|
| 126 | - $group_id = GroupManager :: get_number_of_groups() + 1; |
|
| 127 | - $cat_options = []; |
|
| 128 | - foreach ($group_categories as $index => $category) { |
|
| 129 | - $cat_options[$category['id']] = $category['title']; |
|
| 130 | - } |
|
| 124 | + } |
|
| 125 | + $group_categories = GroupManager::get_categories(); |
|
| 126 | + $group_id = GroupManager :: get_number_of_groups() + 1; |
|
| 127 | + $cat_options = []; |
|
| 128 | + foreach ($group_categories as $index => $category) { |
|
| 129 | + $cat_options[$category['id']] = $category['title']; |
|
| 130 | + } |
|
| 131 | 131 | $form = new FormValidator('create_groups_step2', 'POST', api_get_self().'?'.api_get_cidreq()); |
| 132 | 132 | |
| 133 | - // Modify the default templates |
|
| 134 | - $renderer = $form->defaultRenderer(); |
|
| 135 | - $form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>"; |
|
| 136 | - $renderer->setFormTemplate($form_template); |
|
| 137 | - $element_template = <<<EOT |
|
| 133 | + // Modify the default templates |
|
| 134 | + $renderer = $form->defaultRenderer(); |
|
| 135 | + $form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>"; |
|
| 136 | + $renderer->setFormTemplate($form_template); |
|
| 137 | + $element_template = <<<EOT |
|
| 138 | 138 | <tr class="separate"> |
| 139 | 139 | <td> |
| 140 | 140 | <!-- BEGIN required --> |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | $form->setDefaults($defaults); |
| 227 | 227 | $form->addButtonCreate(get_lang('CreateGroup'), 'submit'); |
| 228 | 228 | $form->display(); |
| 229 | - } |
|
| 229 | + } |
|
| 230 | 230 | } else { |
| 231 | 231 | /* |
| 232 | 232 | * Show form to generate new groups |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | $this_section = SECTION_COURSES; |
| 11 | 11 | |
| 12 | 12 | if (extension_loaded('xapian')) { |
| 13 | - require '../lp/lp_list_search.php'; |
|
| 13 | + require '../lp/lp_list_search.php'; |
|
| 14 | 14 | } else { |
| 15 | 15 | Display::display_header(get_lang('Search')); |
| 16 | 16 | echo Display::return_message(get_lang('SearchXapianModuleNotInstalled'), 'error'); |
@@ -1397,11 +1397,11 @@ discard block |
||
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ' |
| 1400 | - . ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user |
|
| 1400 | + . ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user |
|
| 1401 | 1401 | ON |
| 1402 | 1402 | user.id = course_rel_user.user_id AND |
| 1403 | 1403 | course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH.' ' |
| 1404 | - . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
| 1404 | + . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id "; |
|
| 1405 | 1405 | |
| 1406 | 1406 | if (!empty($course_code)) { |
| 1407 | 1407 | $sql .= ' AND course_rel_user.c_id = "'.$courseId.'"'; |
@@ -1745,7 +1745,7 @@ discard block |
||
| 1745 | 1745 | |
| 1746 | 1746 | // We get the coach for the given course in a given session. |
| 1747 | 1747 | $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER). |
| 1748 | - ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2'; |
|
| 1748 | + ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2'; |
|
| 1749 | 1749 | $rs = Database::query($sql); |
| 1750 | 1750 | while ($user = Database::fetch_array($rs)) { |
| 1751 | 1751 | $userInfo = api_get_user_info($user['user_id']); |
@@ -3561,13 +3561,13 @@ discard block |
||
| 3561 | 3561 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code']; |
| 3562 | 3562 | if ($load_dirs) { |
| 3563 | 3563 | $params['document'] = '<a id="document_preview_'.$courseId.'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
| 3564 | - . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3564 | + . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3565 | 3565 | $params['document'] .= Display::div('', ['id' => 'document_result_'.$courseId.'_0', 'class' => 'document_preview_container']); |
| 3566 | 3566 | } |
| 3567 | 3567 | } else { |
| 3568 | 3568 | if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) { |
| 3569 | 3569 | $params['document'] = '<a id="document_preview_'.$courseId.'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
| 3570 | - . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3570 | + . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3571 | 3571 | $params['document'] .= Display::div('', ['id' => 'document_result_'.$courseId.'_0', 'class' => 'document_preview_container']); |
| 3572 | 3572 | } |
| 3573 | 3573 | } |
@@ -3761,7 +3761,7 @@ discard block |
||
| 3761 | 3761 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course_info['code']; |
| 3762 | 3762 | if ($load_dirs) { |
| 3763 | 3763 | $params['document'] = '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
| 3764 | - . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3764 | + . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3765 | 3765 | $params['document'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class' => 'document_preview_container')); |
| 3766 | 3766 | } |
| 3767 | 3767 | } |
@@ -3904,7 +3904,7 @@ discard block |
||
| 3904 | 3904 | $params['edit_actions'] .= api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course_info['code']; |
| 3905 | 3905 | if ($load_dirs) { |
| 3906 | 3906 | $params['document'] = '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">' |
| 3907 | - . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3907 | + . Display::returnFontAwesomeIcon('folder-open').'</a>'; |
|
| 3908 | 3908 | $params['document'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class' => 'document_preview_container')); |
| 3909 | 3909 | } |
| 3910 | 3910 | } |
@@ -4852,7 +4852,7 @@ discard block |
||
| 4852 | 4852 | get_lang('Subscribe').' '. |
| 4853 | 4853 | Display::returnFontAwesomeIcon('sign-in'), |
| 4854 | 4854 | api_get_path(WEB_COURSE_PATH).$course_info['path']. |
| 4855 | - '/index.php?action=subscribe&sec_token='.$stok, |
|
| 4855 | + '/index.php?action=subscribe&sec_token='.$stok, |
|
| 4856 | 4856 | array( |
| 4857 | 4857 | 'class' => 'btn btn-success btn-sm', |
| 4858 | 4858 | 'title' => get_lang('Subscribe'), |
@@ -57,11 +57,11 @@ |
||
| 57 | 57 | */ |
| 58 | 58 | private $updatedAt; |
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Get id |
|
| 62 | - * |
|
| 63 | - * @return integer |
|
| 64 | - */ |
|
| 60 | + /** |
|
| 61 | + * Get id |
|
| 62 | + * |
|
| 63 | + * @return integer |
|
| 64 | + */ |
|
| 65 | 65 | public function getId() |
| 66 | 66 | { |
| 67 | 67 | return $this->id; |
@@ -184,7 +184,7 @@ |
||
| 184 | 184 | /** |
| 185 | 185 | * @inheritdoc |
| 186 | 186 | */ |
| 187 | - public function processAnswersCreation($form, $exercise) |
|
| 187 | + public function processAnswersCreation($form, $exercise) |
|
| 188 | 188 | { |
| 189 | 189 | $questionWeighting = $nbrGoodAnswers = 0; |
| 190 | 190 | $objAnswer = new Answer($this->id); |
@@ -177,8 +177,8 @@ |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | - * @inheritdoc |
|
| 181 | - */ |
|
| 180 | + * @inheritdoc |
|
| 181 | + */ |
|
| 182 | 182 | public function processAnswersCreation($form, $exercise) |
| 183 | 183 | { |
| 184 | 184 | $questionWeighting = $nbrGoodAnswers = 0; |
@@ -30,8 +30,8 @@ |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | - * @inheritdoc |
|
| 34 | - */ |
|
| 33 | + * @inheritdoc |
|
| 34 | + */ |
|
| 35 | 35 | public function createForm(&$form, $exercise) |
| 36 | 36 | { |
| 37 | 37 | parent::createForm($form, $exercise); |