From 77c013eeaeaedf59027be21c23b7d15eb355ea5d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 16 Jul 2012 15:11:13 +0200 Subject: [PATCH] Adding session list in course info (class info was removed) --- main/admin/course_information.php | 52 ++++++++++++++++------------- main/inc/lib/sessionmanager.lib.php | 10 ++++++ 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/main/admin/course_information.php b/main/admin/course_information.php index 7759d83035..2115d404cb 100644 --- a/main/admin/course_information.php +++ b/main/admin/course_information.php @@ -66,11 +66,11 @@ Display::display_header($tool_name); /* */ ?>
- +
'.get_lang('CourseUsage').''; +echo Display::page_header(get_lang('CourseUsage')); $id_session = intval($_GET['id_session']); $table = new SortableTableFromArray(get_course_usage($course->code,$id_session),0,20,'usage_table'); @@ -79,28 +79,25 @@ $table->set_other_tables(array('user_table','class_table')); $table->set_header(0,get_lang('Tool'), true); $table->set_header(1,get_lang('NumberOfItems'), true); $table->display(); + /** * Show all users subscribed in this course */ -echo '

'.get_lang('Users').'

'; +echo Display::page_header(get_lang('Users')); $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $table_user = Database :: get_main_table(TABLE_MAIN_USER); $sql = "SELECT *,cu.status as course_status FROM $table_course_user cu, $table_user u WHERE cu.user_id = u.user_id AND cu.course_code = '".$code."' AND cu.relation_type <> ".COURSE_RELATION_TYPE_RRHH." "; $res = Database::query($sql); $is_western_name_order = api_is_western_name_order(); -if (Database::num_rows($res) > 0) -{ +if (Database::num_rows($res) > 0) { $users = array (); while ($obj = Database::fetch_object($res)) { $user = array (); $user[] = $obj->official_code; - if ($is_western_name_order) - { + if ($is_western_name_order) { $user[] = $obj->firstname; $user[] = $obj->lastname; - } - else - { + } else { $user[] = $obj->lastname; $user[] = $obj->firstname; } @@ -113,13 +110,10 @@ if (Database::num_rows($res) > 0) $table->set_additional_parameters(array ('code' => $code)); $table->set_other_tables(array('usage_table','class_table')); $table->set_header(0,get_lang('OfficialCode'), true); - if ($is_western_name_order) - { + if ($is_western_name_order) { $table->set_header(1,get_lang('FirstName'), true); $table->set_header(2,get_lang('LastName'), true); - } - else - { + } else { $table->set_header(1,get_lang('LastName'), true); $table->set_header(2,get_lang('FirstName'), true); } @@ -131,19 +125,31 @@ if (Database::num_rows($res) > 0) echo get_lang('NoUsersInCourse'); } +$session_list = SessionManager::get_session_by_course($course->code); +$url = api_get_path(WEB_CODE_PATH); +foreach($session_list as &$session) { + $session[0] = Display::url($session[0], $url.'admin/resume_session.php?id_session='.$session['id'] ); + unset($session[1]); +} + +if (!empty($session_list)) { + echo Display::page_header(get_lang('Sessions')); + $table = new SortableTableFromArray($session_list, 0, 20,'user_table'); + $table->display(); +} + + /*@todo This should be dissapear classes are a deprecated feature*/ -/** - * Show all classes subscribed in this course - */ +/* +//Show all classes subscribed in this course + $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS); $table_class = Database :: get_main_table(TABLE_MAIN_CLASS); $sql = "SELECT * FROM $table_course_class cc, $table_class c WHERE cc.class_id = c.id AND cc.course_code = '".$code."'"; $res = Database::query($sql); -if (Database::num_rows($res) > 0) -{ +if (Database::num_rows($res) > 0) { $data = array (); - while ($class = Database::fetch_object($res)) - { + while ($class = Database::fetch_object($res)) { $row = array (); $row[] = $class->name; $row[] = ''.Display::return_icon('synthese_view.gif', get_lang('Edit')).''; @@ -160,6 +166,6 @@ if (Database::num_rows($res) > 0) echo ''; } else { echo '

'.get_lang('NoClassesForThisCourse').'

'; -} +}*/ /* FOOTER */ Display::display_footer(); \ No newline at end of file diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index c057420fd8..6bf25c89c3 100644 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1789,4 +1789,14 @@ class SessionManager { } } } + + function get_session_by_course($course_code) { + $table_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); + $table_session = Database::get_main_table(TABLE_MAIN_SESSION); + $course_code = Database::escape_string($course_code); + $sql = "SELECT name, s.id FROM $table_session_course sc INNER JOIN $table_session s ON (sc.id_session = s.id) + WHERE sc.course_code = '$course_code' "; + $result = Database::query($sql); + return Database::store_result($result); + } } \ No newline at end of file