diff --git a/main/mySpace/admin.php b/main/mySpace/admin.php old mode 100755 new mode 100644 index 13648a66a2..8afa4631c0 --- a/main/mySpace/admin.php +++ b/main/mySpace/admin.php @@ -1,4 +1,5 @@ "index.php", "name" => get_lang('MySpace')); +$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace')); Display :: display_header($nameTools); api_display_tool_title($nameTools); // Database Table Definitions -$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); -$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); -$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); -$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); -$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER); -$tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN); +$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); +$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); +$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); +$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); +$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER); +$tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN); /** * MAIN PART */ - /* * liste nominative avec coordonnies et lien vers les cours et les stagiaires dont il est le responsable. */ if (isset($_POST['export'])) { - $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname'; + $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname'; } else { - $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname'; + $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname'; } $sql_admins = "SELECT user.user_id,lastname,firstname,email FROM $tbl_user as user, $tbl_admin as admin - WHERE admin.user_id=user.user_id".$order_clause; + WHERE admin.user_id=user.user_id" . $order_clause; $result_admins = Database::query($sql_admins); if (api_is_western_name_order()) { - echo ''; + echo '
'.get_lang('FirstName').''.get_lang('LastName').''.get_lang('Email').'
'; } else { - echo '
' . get_lang('FirstName') . '' . get_lang('LastName') . '' . get_lang('Email') . '
'; + echo '
'.get_lang('LastName').''.get_lang('FirstName').''.get_lang('Email').'
'; } if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { - $header[] = get_lang('FirstName', ''); - $header[] = get_lang('LastName', ''); + $header[] = get_lang('FirstName', ''); + $header[] = get_lang('LastName', ''); } else { - $header[] = get_lang('LastName', ''); - $header[] = get_lang('FirstName', ''); + $header[] = get_lang('LastName', ''); + $header[] = get_lang('FirstName', ''); } $header[] = get_lang('Email', ''); if (Database::num_rows($result_admins) > 0) { - while ($admins = Database::fetch_array($result_admins)) { - - $user_id = $admins["user_id"]; - $lastname = $admins["lastname"]; - $firstname = $admins["firstname"]; - $email = $admins["email"]; - - if ($i % 2 == 0) { - $css_class = "row_odd"; - if ($i % 20 == 0 && $i != 0) { - if (api_is_western_name_order()) { - echo ''; - } else { - echo ''; - } - } - } else { - $css_class = "row_even"; - } - - $i++; - - if (api_is_western_name_order()) { - echo ""; - } else { - echo ""; - } - - if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { - $data[$user_id]["firstname"] = $firstname; - $data[$user_id]["lastname"] = $lastname; - } else { - $data[$user_id]["lastname"] = $lastname; - $data[$user_id]["firstname"] = $firstname; - } - $data[$user_id]["email"] = $email; - } + while ($admins = Database::fetch_array($result_admins)) { + + $user_id = $admins["user_id"]; + $lastname = $admins["lastname"]; + $firstname = $admins["firstname"]; + $email = $admins["email"]; + + if ($i % 2 == 0) { + $css_class = "row_odd"; + if ($i % 20 == 0 && $i != 0) { + if (api_is_western_name_order()) { + echo ''; + } else { + echo ''; + } + } + } else { + $css_class = "row_even"; + } + + $i++; + + if (api_is_western_name_order()) { + echo ""; + } else { + echo ""; + } + + if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) { + $data[$user_id]["firstname"] = $firstname; + $data[$user_id]["lastname"] = $lastname; + } else { + $data[$user_id]["lastname"] = $lastname; + $data[$user_id]["firstname"] = $firstname; + } + $data[$user_id]["email"] = $email; + } } else { - // No results - echo ''; + // No results + echo ''; } echo '
' . get_lang('LastName') . '' . get_lang('FirstName') . '' . get_lang('Email') . '
'.get_lang('FirstName').''.get_lang('LastName').''.get_lang('Email').'
'.get_lang('LastName').''.get_lang('FirstName').''.get_lang('Email').'
$firstname$lastname$email
$lastname$firstname$email
' . get_lang('FirstName') . '' . get_lang('LastName') . '' . get_lang('Email') . '
' . get_lang('LastName') . '' . get_lang('FirstName') . '' . get_lang('Email') . '
$firstname$lastname$email
$lastname$firstname$email
'.get_lang('NoResults').'
' . get_lang('NoResults') . '
'; if (isset($_POST['export'])) { - export_csv($header, $data, 'administrators.csv'); + export_csv($header, $data, 'administrators.csv'); } echo "

"; -echo "
"; - -/* -============================================================================== - FOOTER -============================================================================== -*/ +echo ""; -Display::display_footer(); +Display::display_footer(); \ No newline at end of file diff --git a/main/mySpace/coaches.php b/main/mySpace/coaches.php old mode 100755 new mode 100644 index 91888ca625..5de0770909 --- a/main/mySpace/coaches.php +++ b/main/mySpace/coaches.php @@ -164,7 +164,7 @@ if (Database::num_rows($result_coachs) > 0) { } } else { // No results - echo ''.get_lang("NoResult").''; + echo ''.get_lang("NoResult").''; } echo ''; @@ -174,11 +174,4 @@ if (isset($_POST['export'])){ echo "

"; echo ""; - -/* -============================================================================== - FOOTER -============================================================================== -*/ - -Display::display_footer(); +Display::display_footer(); \ No newline at end of file diff --git a/main/mySpace/course.php b/main/mySpace/course.php index 8def3e2e10..e80f39cdb8 100644 --- a/main/mySpace/course.php +++ b/main/mySpace/course.php @@ -128,7 +128,7 @@ if (!api_is_drh() && !api_is_session_admin() && !api_is_platform_admin()) { $nb_courses = count($a_courses); $table = new SortableTable('tracking_list_course', 'count_courses'); -$table -> set_header(0, get_lang('CourseTitle'), false, 'align="center"'); +$table -> set_header(0, get_lang('CourseTitle'), false); $table -> set_header(1, get_lang('NbStudents'), false); $table -> set_header(2, get_lang('TimeSpentInTheCourse').Display :: return_icon('info3.gif', get_lang('TimeOfActiveByTraining'), array('align' => 'absmiddle', 'hspace' => '3px')), false); $table -> set_header(3, get_lang('ThematicAdvance'), false); @@ -230,8 +230,8 @@ if (is_array($a_courses)) { // $csv_content = array_merge($csv_header, $csv_content); // Before this statement you are allowed to sort (in different way) the array $csv_content. } -$table -> setColAttributes(0, array('align' => 'left')); -$table -> setColAttributes(7, array('align' => 'center')); +//$table -> setColAttributes(0); +//$table -> setColAttributes(7); $table -> display(); Display :: display_footer(); \ No newline at end of file diff --git a/main/mySpace/current_courses.php b/main/mySpace/current_courses.php index f7487b7942..e3dda84b1a 100644 --- a/main/mySpace/current_courses.php +++ b/main/mySpace/current_courses.php @@ -269,7 +269,7 @@ foreach ($array as $row_table) { $column = 0; foreach ($row_table as $cell) { $table->setCellContents($row, $column, $cell); - $table->updateCellAttributes($row, $column, 'align="center"'); + //$table->updateCellAttributes($row, $column, 'align="center"'); $column++; } $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); diff --git a/main/mySpace/index.php b/main/mySpace/index.php index 6849f64cc5..9a52beb6f7 100644 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -383,7 +383,7 @@ if (api_is_allowed_to_create_course() && $view == 'teacher') { $parameters['view'] = 'teacher'; $parameters['class'] = 'data_table'; $table->set_additional_parameters($parameters); - $table -> set_header(0, get_lang('CourseTitle'), false, 'align="center"'); + $table -> set_header(0, get_lang('CourseTitle'), false); $table -> set_header(1, get_lang('NbStudents'), false); $table -> set_header(2, get_lang('AvgTimeSpentInTheCourse').' '.Display :: return_icon('info3.gif', get_lang('TimeOfActiveByTraining'), array('align' => 'absmiddle', 'hspace' => '3px')), false); $table -> set_header(3, get_lang('AvgStudentsProgress').' '.Display :: return_icon('info3.gif', get_lang('AvgAllUsersInAllCourses'), array('align' => 'absmiddle', 'hspace' => '3px')), false); @@ -455,10 +455,6 @@ if (api_is_allowed_to_create_course() && $view == 'teacher') { $table -> addRow($row); } - $table -> setColAttributes(1, array('align' => 'center')); - $table -> setColAttributes(2, array('align' => 'center')); - $table -> setColAttributes(3, array('align' => 'center')); - /* Start session over view stats */ $nb_sessions_past = $nb_sessions_current = 0; @@ -557,18 +553,18 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { $parameters['view'] = 'admin'; $table->set_additional_parameters($parameters); if ($is_western_name_order) { - $table -> set_header(0, get_lang('FirstName'), true, 'align="center"'); - $table -> set_header(1, get_lang('LastName'), true, 'align="center"'); + $table -> set_header(0, get_lang('FirstName'), true); + $table -> set_header(1, get_lang('LastName'), true); } else { - $table -> set_header(0, get_lang('LastName'), true, 'align="center"'); - $table -> set_header(1, get_lang('FirstName'), true, 'align="center"'); + $table -> set_header(0, get_lang('LastName'), true); + $table -> set_header(1, get_lang('FirstName'), true); } $table -> set_header(2, get_lang('TimeSpentOnThePlatform'), false); - $table -> set_header(3, get_lang('LastConnexion'), false, 'align="center"'); + $table -> set_header(3, get_lang('LastConnexion'), false); $table -> set_header(4, get_lang('NbStudents'), false); $table -> set_header(5, get_lang('CountCours'), false); $table -> set_header(6, get_lang('NumberOfSessions'), false); - $table -> set_header(7, get_lang('Sessions'), false, 'align="center"'); + $table -> set_header(7, get_lang('Sessions'), false); if ($is_western_name_order) { $csv_header[] = array ( @@ -667,7 +663,7 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { $table_row[] = $nb_students; $table_row[] = $nb_courses; $table_row[] = $nb_sessions; - $table_row[] = '
'; + $table_row[] = ''; $all_datas[] = $table_row; if ($is_western_name_order) { @@ -711,11 +707,11 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { foreach ($all_datas as $row) { $table -> addRow($row, 'align="right"'); } - +/* $table -> updateColAttributes(0, array('align' => 'left')); $table -> updateColAttributes(1, array('align' => 'left')); $table -> updateColAttributes(3, array('align' => 'left')); - $table -> updateColAttributes(7, array('align' => 'center')); + $table -> updateColAttributes(7, array('align' => 'center'));*/ $table -> display(); } } diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 86d8d129dd..494f267fc2 100644 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -656,17 +656,17 @@ if (empty($_GET['details'])) { ); echo ' - '.$course_info['title'].' - '.$time_spent_on_course .' - '.$progress.' - '.$score.' - '.$attendances_faults_avg.' - '.$scoretotal_display.''; + '.$course_info['title'].' + '.$time_spent_on_course .' + '.$progress.' + '.$score.' + '.$attendances_faults_avg.' + '.$scoretotal_display.''; if (isset ($_GET['id_coach']) && intval($_GET['id_coach']) != 0) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } echo ''; } @@ -777,21 +777,21 @@ if (empty($_GET['details'])) { echo ''; echo Display::tag('td', stripslashes($lp_name)); - echo Display::tag('td', api_time_to_hms($total_time), array('align'=>'center')); + echo Display::tag('td', api_time_to_hms($total_time)); if (!is_null($score)) { if (is_numeric($score)) { $score = $score.'%'; } } - echo Display::tag('td', $score, array('align'=>'center')); + echo Display::tag('td', $score); if (!is_null($score_latest)) { if (is_numeric($score_latest)) { $score_latest = $score_latest.'%'; } } - echo Display::tag('td', $score_latest, array('align'=>'center')); + echo Display::tag('td', $score_latest); if (is_numeric($progress)) { $progress = $progress.'%'; @@ -799,11 +799,10 @@ if (empty($_GET['details'])) { $progress = '-'; } - echo Display::tag('td', $progress, array('align'=>'center')); + echo Display::tag('td', $progress); //Do not change with api_convert_and_format_date, because this value came from the lp_item_view table //which implies several other changes not a priority right now - echo Display::tag('td', $start_time, array('align'=>'center')); - + echo Display::tag('td', $start_time); if ($any_result === true) { $from = ''; @@ -811,11 +810,11 @@ if (empty($_GET['details'])) { $from ='&from=myspace'; } $link = Display::url('','lp_tracking.php?course='.Security::remove_XSS($_GET['course']).$from.'&origin='.Security::remove_XSS($_GET['origin']).'&lp_id='.$learnpath['id'].'&student_id='.$user_info['user_id'].'&id_session='.$session_id); - echo Display::tag('td', $link, array('align'=>'center')); + echo Display::tag('td', $link); } if (api_is_allowed_to_edit()) { - echo ''; + echo ''; if ($any_result === true) { echo ''; echo Display::return_icon('clean.png',get_lang('Clean'),'',ICON_SIZE_SMALL).''; @@ -878,7 +877,7 @@ if (empty($_GET['details'])) { echo ''.$exercices['title'].''; - echo ''; + echo ''; if ($count_attempts > 0) { echo $score_percentage . '%'; @@ -888,8 +887,8 @@ if (empty($_GET['details'])) { } echo ''; - echo ''.$count_attempts.''; - echo ''; + echo ''.$count_attempts.''; + echo ''; $sql_last_attempt = 'SELECT exe_id FROM ' . $tbl_stats_exercices . ' WHERE exe_exo_id ="'.$exercise_id.'" AND @@ -908,7 +907,7 @@ if (empty($_GET['details'])) { } echo ''; - echo ''; + echo ''; $all_attempt_url = "../exercice/exercise_report.php?exerciseId=$exercise_id&cidReq=$course_code&filter_by_user=$student_id&id_session=$session_id"; echo Display::url(Display::return_icon('test_results.png', get_lang('AllAttempts'), array(), ICON_SIZE_SMALL), $all_attempt_url ); diff --git a/main/mySpace/progression.php b/main/mySpace/progression.php old mode 100755 new mode 100644 index 32931d0388..f0fc4a5647 --- a/main/mySpace/progression.php +++ b/main/mySpace/progression.php @@ -58,7 +58,7 @@ if (Database::num_rows($result_course) > 0) { } else { $moyenne_test = null; } - echo ''.$a_course['title'].' '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; + echo ''.$a_course['title'].' '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; } echo ''; echo "

"; diff --git a/main/mySpace/reussite.php b/main/mySpace/reussite.php old mode 100755 new mode 100644 index ae671a3128..e56fa2296e --- a/main/mySpace/reussite.php +++ b/main/mySpace/reussite.php @@ -69,7 +69,7 @@ if (!empty($_GET['session'])) { $moyenne_test = null; } - echo ''.$session['name'].''.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; + echo ''.$session['name'].''.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; } echo ''; } else { @@ -102,17 +102,11 @@ if (!empty($_GET['session'])) { } else { $moyenne_test = null; } - echo ''.$course['title'].''.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; + echo ''.$course['title'].''.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' '; } echo ''; } else { echo get_lang('NoCourse'); } } -/* -============================================================================== - FOOTER -============================================================================== -*/ - -Display :: display_footer(); +Display :: display_footer(); \ No newline at end of file diff --git a/main/mySpace/session.php b/main/mySpace/session.php index f34f4e247d..ecf5551980 100644 --- a/main/mySpace/session.php +++ b/main/mySpace/session.php @@ -156,7 +156,7 @@ if ($nb_sessions > 0) { $table -> addRow($row); } - $table -> setColAttributes(2, array('align' => 'center')); + //$table -> setColAttributes(2, array('align' => 'center')); $table -> display(); if ($export_csv) { diff --git a/main/mySpace/student.php b/main/mySpace/student.php index a194a2555e..c222c4be19 100644 --- a/main/mySpace/student.php +++ b/main/mySpace/student.php @@ -168,11 +168,11 @@ if (api_is_allowed_to_create_course() || api_is_drh()) { if (count($students) > 0) { $table = new SortableTable('tracking_student', 'count_student_coached', null, ($is_western_name_order xor $sort_by_first_name) ? 1 : 0); if ($is_western_name_order) { - $table -> set_header(0, get_lang('FirstName'), false, 'align="center'); - $table -> set_header(1, get_lang('LastName'), false, 'align="center'); + $table -> set_header(0, get_lang('FirstName'), false); + $table -> set_header(1, get_lang('LastName'), false); } else { - $table -> set_header(0, get_lang('LastName'), false, 'align="center'); - $table -> set_header(1, get_lang('FirstName'), false, 'align="center'); + $table -> set_header(0, get_lang('LastName'), false); + $table -> set_header(1, get_lang('FirstName'), false); } /* $table -> set_header(2, get_lang('Time'), false); $table -> set_header(3, get_lang('Progress'), false); @@ -267,8 +267,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) { $row[] = $first_date; $row[] = $string_date; - if ($export_csv) { - + if ($export_csv) { $row[count($row) - 1] = strip_tags($row[count($row) - 1]); $row[count($row) - 2] = strip_tags($row[count($row) - 2]); $csv_content[] = $row; @@ -297,11 +296,6 @@ if (api_is_allowed_to_create_course() || api_is_drh()) { foreach ($all_datas as $row) { $table -> addRow($row, 'align="right"'); } - $table -> updateColAttributes(0, array('align' => 'left')); - $table -> updateColAttributes(1, array('align' => 'left')); - /* $table -> updateColAttributes(7, array('align' => 'left')); - $table -> updateColAttributes(8, array('align' => 'left')); - $table -> setColAttributes(9, array('align' => 'center'));*/ $table -> display(); } else { echo Display::display_warning_message(get_lang('NoStudent')); diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php index 01e447425c..b314adb8a2 100644 --- a/main/mySpace/teachers.php +++ b/main/mySpace/teachers.php @@ -171,7 +171,7 @@ if (count($formateurs) > 0) { } } else { // No results - echo ''.get_lang("NoResults").''; + echo ''.get_lang("NoResults").''; } echo '';